Devin Howard
|
987a2d16d0
|
metamaps.Realtime refactor
|
2016-04-24 12:29:09 +08:00 |
|
Connor Turland
|
8197d74955
|
wasn't including the right people in some circumstances
|
2016-04-22 15:02:16 -04:00 |
|
Connor Turland
|
a3b4f96d37
|
don't execute if there's no map
|
2016-04-22 14:32:24 -04:00 |
|
Connor Turland
|
1c988b5a8f
|
switch to green
|
2016-04-22 14:31:56 -04:00 |
|
Connor Turland
|
71c11cc79e
|
improve wording
|
2016-04-22 12:35:38 -04:00 |
|
Connor Turland
|
d90e51eb1e
|
better email
|
2016-04-22 12:02:06 -04:00 |
|
Connor Turland
|
46540ff753
|
make recommendation they sign in and retry
|
2016-04-22 10:58:49 -04:00 |
|
Connor Turland
|
ce72bde309
|
just do it in the controller
|
2016-04-22 12:51:07 +00:00 |
|
Connor Turland
|
7cf0ddc2ee
|
needs to be before?
|
2016-04-22 12:38:38 +00:00 |
|
Connor Turland
|
5928969724
|
when topic or synapse is no longer on a map, don't defer
|
2016-04-22 12:27:26 +00:00 |
|
Devin Howard
|
b2da15245a
|
I believe this fixes the error connor brought up
|
2016-04-22 14:00:35 +08:00 |
|
Devin Howard
|
c7402c3ee5
|
Merge branch 'develop' into feature/flex.permissions
|
2016-04-22 13:57:27 +08:00 |
|
Connor Turland
|
6c7ce56e4f
|
yeehaw add collaborators
|
2016-04-21 18:54:26 -04:00 |
|
Devin Howard
|
44ae6730a6
|
fix user search error
|
2016-04-21 00:30:11 -04:00 |
|
Devin Howard
|
e569a0376d
|
Merge pull request #548 from metamaps/feature/refactor-javascript
split out all javascript files
|
2016-04-20 11:24:20 +08:00 |
|
Connor Turland
|
fa51ee850e
|
change the list
|
2016-04-19 23:20:37 -04:00 |
|
Devin Howard
|
837e4bde1b
|
fix map forking (fix #540)
|
2016-04-20 09:00:45 +08:00 |
|
Connor Turland
|
ab70d65aab
|
enable shared private and public maps
|
2016-04-19 10:35:37 +08:00 |
|
Devin Howard
|
c1d963d669
|
remove .erb from files that don't need it
|
2016-04-15 09:18:17 +08:00 |
|
Devin Howard
|
8bb96d12a6
|
Metamaps.Control
|
2016-04-15 09:13:01 +08:00 |
|
Devin Howard
|
6a8921ae6d
|
standard-format Metamaps.JIT.js.erb
|
2016-04-15 09:13:01 +08:00 |
|
Devin Howard
|
074eaf0bd3
|
alphabetize dependecies
|
2016-04-15 09:13:01 +08:00 |
|
Devin Howard
|
324719e531
|
Metamaps.Filter
|
2016-04-15 09:13:01 +08:00 |
|
Devin Howard
|
b10f0cef0e
|
Metamaps.Listeners.js.erb
|
2016-04-15 09:13:01 +08:00 |
|
Devin Howard
|
a5bd0440a8
|
Metamaps.Organize
|
2016-04-15 09:13:01 +08:00 |
|
Devin Howard
|
ca5928113d
|
whoops don't forget standard format
|
2016-04-15 09:13:01 +08:00 |
|
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
|
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
|
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
|
c9bba0cdb2
|
rename repo
|
2016-04-13 10:16:54 +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 |
|
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
|
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 |
|
Connor Turland
|
8fa856451d
|
request invite page was broken
|
2016-03-27 12:04:28 -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 |
|