Connor Turland
9070bfc836
use a subset of the simplest metacodes for new users ( #633 )
...
* use a subset of the simplest ones for new users
* Update user_preference.rb
* Update user_preference.rb
2016-09-09 20:36:49 -04:00
Devin Howard
3e38fba215
remove relatives1 and relatives2
2016-09-05 11:55:19 +08:00
Devin Howard
e761e1693c
use Topic.relatives scope to get all relatives
2016-09-05 11:52:35 +08:00
Connor Turland
7de89cfa0f
shouldn't reference relatives that are connected in private ways
2016-09-02 12:37:01 -04:00
Connor Turland
549c086af4
styleee ( #620 )
2016-08-31 18:57:19 -04:00
Connor Turland
19dabe81cc
Enable users to star maps, and to see their starred collection ( #615 )
...
* enable starring
* users should be able to star others maps
* proper star icon
* starred maps display as starred without refreshing
* oops
* make phrasing clearer
2016-08-31 16:58:49 -04: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
Connor Turland
c08868a5c1
user presence event ( #552 )
2016-04-26 08:08:12 -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
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
Connor Turland
a82b0048d8
don't need sequenced
2016-03-27 00:14:22 -07:00
Devin Howard
d3649f1d26
DRY map exporting with policy_scoping
2016-03-26 12:46:43 +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
6c055ea3b9
add missing synapses_csv function ( fixes #504 )
2016-03-25 16:36:05 +08:00
Connor Turland
c4890274f2
switch messages to use pundit
2016-03-23 16:29:26 -07: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
Devin Howard
d11f3923dd
remove unused has_viewable_synapses function
2016-03-14 14:34:36 +08:00
Connor Turland
604087c592
Merge branch 'develop' into feature/realtime.video
2016-03-14 10:45:16 +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
7f86810f62
remove things again not needed
2016-03-12 11:53:12 +11:00
Connor Turland
bef21341c6
pundit: fixing up topics and synapses
2016-03-12 11:10:30 +11:00
Connor Turland
450db5eb8d
changes for pundit
2016-03-12 09:37:32 +11:00
Connor Turland
669b337d04
changes for api
2016-03-12 09:37:18 +11:00
Connor Turland
059591b78b
first pass at important API endpoints, token auth
2016-03-11 17:16:04 +11:00
Connor Turland
c6fea78054
merge develop
2016-02-29 13:58:47 +13:00
Devin Howard
40cd1ebb5c
modify metacodes to instead have two fields, and validate that only one is present. Manual icons can be entered through rake tasks or on the rails console or in db seed
2016-02-25 14:49:48 +08:00
Devin Howard
295534e4ab
migrate to using aws/paperclip for metacodes. RUN RAKE TASK ON PRODUCTION
2016-02-23 14:58:20 +08:00
Devin Howard
b385efafa9
don't need xloc or yloc for Synapse mappings
2016-02-21 17:25:39 +08:00
Devin Howard
f9bcd33344
update synapses specs; all specs pass again. all models/controllers tested
2016-02-09 14:25:39 +08:00
Devin Howard
7f50db1ae9
ok metacode spec done
2016-02-09 13:30:49 +08:00
Devin Howard
43bdda61de
maps controller spec passes, 3 pending
2016-02-09 11:48:07 +08:00
Devin Howard
e460899ea3
testing simplecov and rcov stuff
2016-02-08 11:19:39 +08:00
Devin Howard
cc99ed001d
fix mapping_controller_spec.rb
2016-02-08 11:19:38 +08:00
Devin Howard
fa3a725df9
mapping spec
2016-02-08 11:19:37 +08:00
Devin Howard
987cd7f5a0
Merge branch 'feature/xls.export' into release/v2.8
2016-02-08 09:58:09 +08:00
Devin Howard
0ae8ea0ca5
implement csv/xls export
2016-02-07 13:12:18 +08:00
Devin Howard
8202fb38f3
Merge branch 'develop' into feature/realtime.video
2016-02-05 16:27:43 +08:00
Devin Howard
f2cbde50ca
dos2unix on the whole repo
2016-02-05 11:43:15 +08:00
Connor Turland
4557b8e305
merge develop
2016-01-22 14:59:09 +13:00
Devin Howard
4469b29ec2
in user model
2016-01-07 15:32:19 +08:00
Devin Howard
bf21dcc3e6
merge develop into rspec tests
2016-01-06 23:03:34 +08:00
Connor Turland
49dd2f2e92
merge develop
2015-12-22 13:16:03 -05:00
Devin Howard
888edae6f6
finish remove asset_path_icon whoops
2015-12-20 22:28:05 +08:00
