Devin Howard
|
de62a08307
|
Metamaps.Topic
|
2016-04-15 09:13:01 +08:00 |
|
Devin Howard
|
4833dd8da6
|
Metamaps.Synapse
|
2016-04-15 09:13:01 +08:00 |
|
Devin Howard
|
11a87582c7
|
Metamaps.Map
|
2016-04-15 09:13:01 +08:00 |
|
Devin Howard
|
13d6ab56e5
|
factor out two more small view modules
|
2016-04-15 09:13:01 +08:00 |
|
Connor Turland
|
7bb7f345f1
|
added an event for conversations starting (#547)
* added an event for conversations starting
* switch to post
|
2016-04-14 14:35:28 -04:00 |
|
Devin Howard
|
317f0c245e
|
Merge pull request #545 from metamaps/feature/refactor-javascript
JS refactoring part 1 of many!
|
2016-04-14 12:35:21 +08:00 |
|
Devin Howard
|
fb80f56a7d
|
slack exception notifications
|
2016-04-13 17:20:01 +08:00 |
|
Devin Howard
|
134d4171f8
|
alphabetize gemfile
|
2016-04-13 17:07:23 +08:00 |
|
Devin Howard
|
6653d10edf
|
Debug gets a header. Still need to parse through Metamaps, Metamaps.GlobalUI, and Metamaps.JIT
|
2016-04-13 16:06:01 +08:00 |
|
Devin Howard
|
be99ad8285
|
factor out Metamaps.Admin
|
2016-04-13 16:04:15 +08:00 |
|
Devin Howard
|
799f6e4623
|
Metamaps.Router standard style
|
2016-04-13 15:58:54 +08:00 |
|
Devin Howard
|
df9c0a93bc
|
Metamaps.Views standard style
|
2016-04-13 15:58:54 +08:00 |
|
Devin Howard
|
e8c55df4e8
|
Metamaps.Backbone standard style
|
2016-04-13 15:58:54 +08:00 |
|
Devin Howard
|
5a3ab025b7
|
Metamaps.Import standard style
|
2016-04-13 15:58:54 +08:00 |
|
Devin Howard
|
031e35e50c
|
Merge branch 'develop'
|
2016-04-13 10:53:46 +08:00 |
|
Devin Howard
|
d2d67d5d6c
|
Merge pull request #544 from metamaps/fix/versioncode
quick fix to version code code
|
2016-04-13 10:53:31 +08:00 |
|
Devin Howard
|
e6c4313184
|
reindent upperelements template + fix input tag
|
2016-04-13 10:50:51 +08:00 |
|
Devin Howard
|
a2ce20b564
|
versioncode fix
|
2016-04-13 10:48:34 +08:00 |
|
Devin Howard
|
bd1e1ffe81
|
ruby gemset
|
2016-04-13 10:32:34 +08:00 |
|
Devin Howard
|
3040c004f0
|
ruby gemset
|
2016-04-13 10:32:27 +08:00 |
|
Devin Howard
|
0de7333d6a
|
Merge branch 'develop'
|
2016-04-13 10:26:01 +08:00 |
|
Devin Howard
|
5ed1fd3156
|
v2.8.4
|
2016-04-13 10:19:35 +08:00 |
|
Devin Howard
|
0a9a1c27d8
|
Merge pull request #543 from metamaps/feature/rename-repo
rename repo
|
2016-04-13 10:17:30 +08:00 |
|
Devin Howard
|
c9bba0cdb2
|
rename repo
|
2016-04-13 10:16:54 +08:00 |
|
Devin Howard
|
6659a97f28
|
Merge pull request #536 from metamaps/feature/metamaps.debug
metamaps.debug function, and move VERSION into a rails constant initializer.
|
2016-04-13 10:14:23 +08:00 |
|
Devin Howard
|
fd9c27c631
|
Merge pull request #535 from metamaps/feature/cors
add rack-cors; fix #531
|
2016-04-13 10:13:16 +08:00 |
|
Devin Howard
|
e27d64e643
|
only allow cors on api routes
|
2016-04-06 20:09:25 +08:00 |
|
Devin Howard
|
2e6f04d0be
|
metamaps.debug function, and move VERSION into a rails constant initializer.
from this commit on, we would need to modify config/initializers/version.rb to increment the version number.
|
2016-04-06 10:27:31 +08:00 |
|
Devin Howard
|
a8d0d9da09
|
2.8.3:
- add Junto sounds
- fix json import
- fix invite link
|
2016-04-06 10:06:37 +08:00 |
|
Devin Howard
|
7de642ccb2
|
add rack-cors; fix #531
|
2016-04-05 10:12:12 +08:00 |
|
Connor Turland
|
8a6d434fc3
|
Junto Sounds
* awesome news sounnndzzzz
* prevent double sound
* bug fixes and chat sounds on by default
|
2016-04-04 10:50:02 -04:00 |
|
Devin Howard
|
f21a3d114f
|
Merge pull request #529 from metamaps/fix/import-fixes
fix json import
|
2016-04-01 13:37:43 +08:00 |
|
Devin Howard
|
7eb8ae37ee
|
Merge pull request #526 from metamaps/fix/invite-link
fix invite link
|
2016-04-01 13:37:33 +08:00 |
|
Devin Howard
|
7d6acb7014
|
fix json import
|
2016-03-31 13:03:14 +08:00 |
|
Devin Howard
|
a83382efe9
|
Merge branch 'develop'
v2.8.2 - fixes import code
|
2016-03-31 10:11:49 +08:00 |
|
Devin Howard
|
b9b9e57c41
|
Merge pull request #528 from metamaps/fix/import-fixes
import fixes
|
2016-03-31 10:04:33 +08:00 |
|
Devin Howard
|
ccd07ddd19
|
import fixes
|
2016-03-31 09:25:14 +08:00 |
|
Devin Howard
|
a2fe1399e4
|
fix invite link
|
2016-03-29 22:34:47 +08:00 |
|
Devin Howard
|
c1aa7c6a92
|
Merge pull request #523 from metamaps/feature/production-deploy-steps
add production deploy/update steps (see issue #518)
|
2016-03-29 10:00:00 +08:00 |
|
Devin Howard
|
da25dd0d9c
|
add production deploy/update steps (see issue #518)
|
2016-03-28 10:38:24 +08:00 |
|
Raymon Johnstone
|
b2a4cbf3ec
|
Merge pull request #522 from Tadasu85/master
Merge pull request #1 from metamaps/master
|
2016-03-27 18:09:16 -04:00 |
|
Connor Turland
|
e1c0509c91
|
Merge pull request #520 from metamaps/develop
fix request invite
|
2016-03-27 12:12:26 -07:00 |
|
Connor Turland
|
3c03d30c08
|
Merge pull request #519 from metamaps/bug/requestinvite
request invite page was broken
|
2016-03-27 12:11:21 -07:00 |
|
Connor Turland
|
8fa856451d
|
request invite page was broken
|
2016-03-27 12:04:28 -07:00 |
|
Connor Turland
|
fbba487b83
|
Merge pull request #482 from metamaps/develop
merge develop into master (version 2.8!)
|
2016-03-27 00:43:54 -07:00 |
|
Devin Howard
|
8a6e702c12
|
fix js error
|
2016-03-27 15:32:18 +08:00 |
|
Devin Howard
|
dae3106b34
|
Merge pull request #509 from metamaps/feature/import.export
import/export tweaks
|
2016-03-27 15:22:17 +08:00 |
|
Connor Turland
|
49f4b2030e
|
gemfile.lock needed to change for travis to be happy
|
2016-03-27 00:21:32 -07:00 |
|
Devin Howard
|
30d327f07a
|
solution using backbone events instead of setTimeout
|
2016-03-27 15:20:09 +08:00 |
|
Connor Turland
|
a82b0048d8
|
don't need sequenced
|
2016-03-27 00:14:22 -07:00 |
|