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

1377 commits

Author SHA1 Message Date
Connor Turland
dc60c3f3ed add profile image and fix exploreMaps bar 2016-08-12 05:03:28 +00:00
Devin Howard
796f4d57a1 I think this fixes issue #566 but I'm not sure 2016-08-12 12:39:30 +08:00
Connor Turland
b4c75649ba all teh mobile things 2016-08-12 04:04:18 +00:00
Connor Turland
449c2084bb make maps go under explore bar 2016-08-11 17:26:11 -04:00
Connor Turland
44bb0020bc Merge branch 'develop' into paring.down 2016-08-11 15:59:45 -04:00
Connor Turland
bdac00bc10 fix typo 2016-08-11 01:44:40 +00:00
Connor Turland
848bb11c08 needed to clear div switching between map view and topic view 2016-08-10 18:37:26 +00:00
Connor Turland
d5cec3844b make sure toast hides again 2016-08-10 18:08:48 +00:00
Connor Turland
a3f1d51bc6 make the toast work 2016-08-10 18:06:28 +00:00
Connor Turland
da090e60db remove homepage changes 2016-08-10 17:32:43 +00:00
Connor Turland
c308e276e8 Merge branch 'develop' into paring.down 2016-08-10 17:16:33 +00:00
Devin Howard
63b528c8bf don't import into textarea elements either - fix #579 (#598) 2016-08-10 13:14:33 -04:00
Connor Turland
f71d552504 Merge branch 'develop' into paring.down 2016-08-10 17:09:37 +00:00
Devin Howard
beb52bc471 fix topic view keyboard shortcuts (#597) 
* fix topic view selection crash on centerAndReveal

* topic view shortcuts switch to Alt

* change delete behaviour to be smarter

* fetchRelatives recursively handles arrays

* update topic url and Metamaps.Active.Topic when you center

* make heroku work 4 realz
 2016-08-09 11:53:50 -04:00
Devin Howard
3b24165fd0 Merge pull request #589 from metamaps/feature/topicview-remove-topics 
enable removal of topics from topic view - fixes #467
 2016-08-08 21:46:15 +08:00
Devin Howard
9cedf69432 fetch siblings & center topic keyboard shortcuts - fixes #466 (#588) 
* fetch siblings & center topic keyboard shortcuts - fixes #466

* add keyboard shortcut labels

* update keyboard shortcuts to Ctrl+E, Ctrl+R, and Ctrl+T, and update docs

* zoom extents back to Ctrl+E and use e.preventDefault
 2016-08-08 21:46:05 +08:00
Devin Howard
3050f1413a Merge pull request #587 from metamaps/feature/topicview-selection-box 
fix selection box on radial view - fix #463
 2016-08-08 21:43:22 +08:00
Devin Howard
5510cb2e99 enable removal of topics from topic view - fixes #467 2016-08-08 21:40:55 +08:00
Devin Howard
77e8716588 Merge branch 'master' into develop 2016-08-07 17:23:57 +08:00
Devin Howard
23543ac7ad fix: synapse import fails if synapses are missing desc 2016-08-07 17:18:54 +08:00
Devin Howard
d778016571 fix selection box on radial view - fix #463 2016-08-07 13:17:25 +08:00
Connor Turland
17da8441f4 fixup react setup 2016-08-04 13:58:59 -04:00
Connor Turland
4005b301ac uncomment commented header lines 2016-08-04 13:58:59 -04:00
Connor Turland
804afc3e1d remove famous leftovers 2016-08-04 13:58:59 -04:00
Connor Turland
ede1dfb91c made the header more generic to serve other functions 2016-08-04 13:58:59 -04:00
Connor Turland
30e9a27663 almost rid of famous completely 2016-08-04 13:58:06 -04:00
Connor Turland
aed423214f started using react instead of famous 2016-08-04 13:57:35 -04:00
Connor Turland
6b2386a545 progress onthe home page 2016-08-04 13:56:39 -04:00
Connor Turland
293e68da05 remove old stuff 2016-08-04 13:56:39 -04:00
Devin Howard
a6951920eb fix module.exports javascript bug 2016-08-04 17:08:10 +08:00
Devin Howard
69bdb0bf01 hotfix master with mappable_policy.try 2016-08-04 17:04:01 +08:00
Devin Howard
6df8da16bc Merge branch 'master' into develop 2016-08-04 10:51:36 +08:00
Devin Howard
720f67cee7 move metacode loading earlier, and add a query string to work around amazon aws CORS issues 2016-08-03 08:54:10 +08:00
Devin Howard
6997142fd9 finish integrating npm. move underscore/backbone into npm management (#577) 
* finish integrating npm. move underscore/backbone into npm management

* update docs for npm integration

* allow jsx or js extension

* change underscore version
 2016-08-01 15:59:53 -04:00
Devin Howard
e6954eb37a Merge pull request #574 from metamaps/fix/synapse-search-duplicates 
fix synapse autocomplete duplicates
 2016-08-01 08:56:55 +08:00
Devin Howard
5fe03641cb move frontend code into a folder, and setup react build tooling with es6 transforms (#576) 2016-07-31 14:51:06 -04:00
Devin Howard
4161f70d2e remove duplicates from synapse search 
there were 2 issues. one is synapses with leading/trailing whitespace. I've run a script on production to strip existing leading/trailing whitespace from synapse descs.

The second issue was that this code wasn't actually modifying the @synapses array, and collectedDesc wasn't doing anything. So this new line will be more effective.
 2016-07-31 19:31:31 +08:00
Devin Howard
7d4da81272 Update code style automatically using rubocop gem (#563) 
* install rubocop

* 1961 automatic rubocop fixes

* update rubocop.yml to ignore half of the remaining cops

* rubocop lint warnings

* random other warnings fixed
 2016-07-26 08:14:23 +08:00
Devin Howard
e5c9af8f95 use Wildcard if no metacode 2016-07-24 13:43:12 +08:00
Devin Howard
27942546b8 fix 2 bugs on develop (#565) 
* fix js bug

* if mappable is nil it causes an error
 2016-07-02 16:32:02 +08:00
Devin Howard
872ae90832 submit new map form on Enter - fixes #555 (#562) 
* submit new map form on Enter - fixes #555

* update divs too
 2016-07-01 16:48:38 +08:00
Devin Howard
6c22ebcc51 have policy_scope always use scope.all or something else to ensure it's an ActiveRecord relation 2016-06-28 14:49:46 +08:00
Devin Howard
b72536853f fix activemaps_path url bug (#559) 
* fix activemaps_path url bug

* annoying doc updates

* skip policy scope if redirecting an explore page

* lol that would have been dumb
 2016-06-20 08:32:39 +08:00
Devin Howard
f5912d511d fix activemaps_path url bug (#559) 
* fix activemaps_path url bug

* annoying doc updates

* skip policy scope if redirecting an explore page

* lol that would have been dumb
 2016-06-20 08:31:32 +08:00
Devin Howard
6e1797183e brakeman (#556) 
* update rails to 4.2.5.1

* fix brakeman gem warning

* make brakeman happier and add it to travis

* install brakeman gem for static security analysis

* fix brakeman call in travis
 2016-06-16 15:44:08 +08:00
Devin Howard
1f9078638e fix truncate bug when map desc is nil (#557) 2016-06-16 15:42:43 +08:00
Devin Howard
2989406954 fix truncate bug when map desc is nil 2016-06-15 12:17:32 +08:00
Connor Turland
c08868a5c1 user presence event (#552) 2016-04-26 08:08:12 -04:00
Devin Howard
45adda93b1 set up scaffolding for js tests (#553) 2016-04-26 10:22:32 +08:00
Connor Turland
2a3fa80540 wording needed updating 2016-04-24 12:15:40 -04:00
Connor Turland
8c51108a0c enable shared private and public maps (#530) 
* enable shared private and public maps

* change the list

* yeehaw add collaborators

* I believe this fixes the error connor brought up

* when topic or synapse is no longer on a map, don't defer

* needs to be before?

* just do it in the controller

* make recommendation they sign in and retry

* better email

* config for mailer previews

* improve wording

* shouldn't have included that

* switch to green

* don't execute if there's no map

* wasn't including the right people in some circumstances

* Finish breaking out JS files (#551)

* metamaps.Realtime refactor

* Metamaps.Util

* Metamaps.Visualize

* Metamaps.SynapseCard

* Metamaps.TopicCard

* Metamaps.Create.js

* Remove erb extension from Metamaps.Map.js

* Metmaps.Account and Metamaps.GlobalUI remove extension

* Metamaps.JIT no more erb extension

* move Backbone.init; standard-format on Metamaps.js.erb

* factor out canvas support check function

* some llittle template bugs

* remove featured from signed in explore maps bar

* don't let it overflow off the page
 2016-04-24 11:50:35 -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
Devin Howard
837e4bde1b fix map forking (fix #540) 2016-04-20 09:00:45 +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
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