glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
1781 commits 40 branches 27 tags 58 MiB
Commit graph

1267 commits

Author SHA1 Message Date
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
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
Devin Howard
f9e6249615 Fix up import - want more backboney event listening though 2016-03-27 15:09:08 +08:00
Devin Howard
ae9f4a51a2 fix a few embarassing errors - export is working 2016-03-26 15:53:14 +08:00
Devin Howard
53867caae8 allow JSON or TSV parsing 2016-03-26 15:03:44 +08:00
Devin Howard
92f78aa56a update tsv code to handle new export code at the very least. 
next step will be allowing json input too
 2016-03-26 12:49:26 +08:00
Devin Howard
d3649f1d26 DRY map exporting with policy_scoping 2016-03-26 12:46:43 +08:00
Devin Howard
14bdc8546b metacodes#show routes 2016-03-26 10:12:32 +08:00
Devin Howard
387c863222 fix a bug with synapses and use cid to link new topics with synapses 
Synapses are now created client-side, but still rejected server-side
 2016-03-25 16:48:14 +08:00
Devin Howard
c77cc32734 import fixes 
- better abort logic & messaging
 - handle \r line delim
 - better example format at top
 2016-03-25 16:48:14 +08:00
Devin Howard
ea677f8a6b DRY up csv/xls rendering, put it into model 2016-03-25 16:48:14 +08:00
Devin Howard
8f532708ce update xls/csv format to better serialize topics and synapses 2016-03-25 16:47:35 +08:00
Devin Howard
61262aaec2 implement csv/xls export 2016-03-25 16:47:35 +08:00
Devin Howard
0c1e12a301 use state machine to implement smarter topic/synapse import 
also include better auto-layout of new topics if x/y not specified
 2016-03-25 16:46:05 +08:00
Devin Howard
b47ed7b5b4 don't ask about adding 0 topics 2016-03-25 16:46:05 +08:00
Devin Howard
6df7fa849a bare minimum topic import functionality - use by Ctrl+V onto the map canvas itself 2016-03-25 16:46:05 +08:00
Devin Howard
6c055ea3b9 add missing synapses_csv function (fixes #504) 2016-03-25 16:36:05 +08:00
Connor Turland
87d6dfe8de fix the autocomplete 2016-03-24 23:36:57 -07:00
Connor Turland
b36d5df6cb this may make it work 2016-03-24 23:33:26 -07:00
Connor Turland
c6f1e3cc4a breaking the mapping_policy 2016-03-24 23:29:08 -07:00
Connor Turland
fc1dc591f3 Merge branch 'copy/version.and.peers' into develop 2016-03-24 21:28:24 -07:00
Connor Turland
415c9b8ac3 final touchups on oauth 2016-03-24 21:26:07 -07:00
Connor Turland
540b35c757 Merge branch 'feature/no-cancancan' into develop 2016-03-24 20:47:35 -07:00
Connor Turland
42eea78bc4 Merge branch 'fix/typo' into develop 2016-03-24 20:47:23 -07:00
Devin Howard
530a16cadb instantiate_resource 2016-03-25 10:26:32 +08:00
Devin Howard
34d3a80db1 use new pundit-enabled snorlax 2016-03-25 10:07:57 +08:00
Connor Turland
14dfe3c926 styling for doorkeeper and api functional 2016-03-24 17:16:27 -07:00
Connor Turland
b6fac7d49b Merge pull request #420 from metamaps/feature/realtime.video 
JUUUUUUUUNTOOOO
 2016-03-23 17:46:35 -07:00
Connor Turland
70bc0959b0 update version, date, and peers 2016-03-23 16:52:53 -07:00
Connor Turland
c4890274f2 switch messages to use pundit 2016-03-23 16:29:26 -07:00
Connor Turland
baa5439f0f auto position videos which haven't been manually positioned 2016-03-23 16:12:23 -07:00
Connor Turland
617dec72b9 hide sound option. green 'in call' dot. tooltip 2016-03-21 13:08:34 -07:00
Devin Howard
756fe75664 call for developers in Inspect Element window 2016-03-15 16:06:37 +08:00
Connor Turland
1ee33b843f Merge branch 'develop' into feature/realtime.video 2016-03-14 21:40:25 +11:00
Connor Turland
3e24a088da Merge branch 'develop' of github.com:metamaps/metamaps_gen002 into develop 2016-03-14 21:36:57 +11:00
Connor Turland
8bd032472d topic related things weren't working at all 2016-03-14 21:36:34 +11:00
Connor Turland
f24def8be6 fix up javascript errors 2016-03-14 21:36:16 +11:00
Devin Howard
a05c7dc5fe avoid pundit error if no map specified with a mapping 2016-03-14 14:37:01 +08:00
Devin Howard
d11f3923dd remove unused has_viewable_synapses function 2016-03-14 14:34:36 +08:00
Devin Howard
3823c708fd update mapping policy 2016-03-14 11:09:27 +08:00
Connor Turland
8664cc0bd9 Merge branch 'develop' into feature/realtime.video 2016-03-14 11:11:11 +11:00
Connor Turland
579c36ec75 ensure the search box opens 2016-03-14 11:10:18 +11:00
Connor Turland
6715ba7e7f not a function 2016-03-14 11:03:11 +11:00
Connor Turland
604087c592 Merge branch 'develop' into feature/realtime.video 2016-03-14 10:45:16 +11:00
Connor Turland
6f5258cbb7 needed a policy for tokens 2016-03-14 08:19:26 +11:00
Harlan T Wood
3fbb3d1dc9 more token entropy 2016-03-13 00:56:10 -08:00
Connor Turland
72b2e8f8f2 doesn't look good for now, take it out, add it later 2016-03-13 11:58:09 +11:00
Connor Turland
77d69dd2a3 turns out we do need delayed_job 2016-03-13 11:56:18 +11:00
Connor Turland
11e57c1b37 rebase onto develop which now has API and pundit 2016-03-13 10:36:38 +11:00
Connor Turland
b236f4c689 handle not logged in scenarios 2016-03-13 02:41:32 +11:00
Connor Turland
3aec00e07c just don't include mappable for now 2016-03-13 02:28:39 +11:00
Connor Turland
f072e39c4c pundit: sometimes no user 2016-03-13 02:27:05 +11:00
Connor Turland
ada29c6832 cleanup 2016-03-12 21:35:56 +11:00
Connor Turland
efe13dc7c0 Merge branch 'develop' into feature/api 2016-03-12 21:30:27 +11:00
Connor Turland
f58185fd40 Merge branch 'feature/pundit' into develop 2016-03-12 21:26:06 +11:00
Connor Turland
446619c451 omg not having this was breaking things 2016-03-12 13:20:15 +11:00
Connor Turland
8b8db40c67 Merge branch 'feature/pundit' into feature/api 2016-03-12 12:59:42 +11:00
Connor Turland
a295c61322 json response was broken 2016-03-12 12:58:13 +11:00
Connor Turland
e4ac5b0134 Merge branch 'feature/pundit' into feature/api 2016-03-12 12:40:11 +11:00
Connor Turland
bf4fbbeb06 fix tokens 2016-03-12 12:26:23 +11:00
Devin Howard
bb03b49d80 update main controller (searching) to use policies 2016-03-12 09:09:41 +08:00
Connor Turland
521aa6b5d0 function no longer exists 2016-03-12 11:58:26 +11:00
Connor Turland
7f86810f62 remove things again not needed 2016-03-12 11:53:12 +11:00
Connor Turland
a78312f90c Merge branch 'feature/pundit' into feature/api.pundit 2016-03-12 11:49:41 +11:00
Connor Turland
bc505a1361 pundit: now updating maps actually works 2016-03-12 11:47:40 +11:00
Connor Turland
5d179ae5ec pundit: policy didn't exist 2016-03-12 11:47:32 +11:00
Connor Turland
d0aecc0b31 pundit: make it work 2016-03-12 11:47:24 +11:00
Connor Turland
dc6ccd2022 pundit: fixing up topics and synapses 2016-03-12 11:47:05 +11:00
Connor Turland
1cf3182e75 pundit: exclude topic action 2016-03-12 11:46:52 +11:00
Connor Turland
bd3afff069 pundit: fix queries 2016-03-12 11:46:31 +11:00
Connor Turland
5f3f5212c5 pundit: syntax error 2016-03-12 11:46:18 +11:00
Connor Turland
2d53922f1c can load maps 2016-03-12 11:46:01 +11:00
Connor Turland
d8c328468e changess for pundit 2016-03-12 11:45:39 +11:00
Connor Turland
d0fd676aa0 pundit: now updating maps actually works 2016-03-12 11:35:03 +11:00