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

255 commits

Author SHA1 Message Date
Devin Howard b36dc03f59 bump version to 2.9.0 2016-09-01 10:14:02 +08: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
Connor Turland 57181e208f layout tweaks (#607) 
* new map creation pops to new window

* hide the search on logged out homepage

* add { }

* just writing the same code better

* remove that old code
 2016-08-16 08:03:06 -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
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 1d12aed3eb switch to dotenv-rails 2016-06-07 12:55:49 +08:00
Devin Howard 11f921b058 remove secret key from source control - fixme on production. 
This will expire all cookies, but make our install more secure from
hackers who know their way around Github
 2016-06-07 12:54:55 +08: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 da0da1a117 Merge pull request #546 from metamaps/feature/exception-notification 
slack exception notifications
 2016-04-20 09:06:42 +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 fb80f56a7d slack exception notifications 2016-04-13 17:20:01 +08:00
Devin Howard a2ce20b564 versioncode fix 2016-04-13 10:48:34 +08:00
Devin Howard 5ed1fd3156 v2.8.4 2016-04-13 10:19:35 +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 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 7de642ccb2 add rack-cors; fix #531 2016-04-05 10:12:12 +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
Connor Turland 14dfe3c926 styling for doorkeeper and api functional 2016-03-24 17:16:27 -07:00
Connor Turland 5317711b57 Merge branch 'develop' into oauth.provider 2016-03-23 18:00:59 -07:00
Connor Turland e6ac4b1dcb make metamaps an oauth provider 2016-03-19 13:28:55 +11:00
Connor Turland 604087c592 Merge branch 'develop' into feature/realtime.video 2016-03-14 10:45:16 +11:00
Connor Turland 77d69dd2a3 turns out we do need delayed_job 2016-03-13 11:56:18 +11:00
Connor Turland d863d1c15b remove traces of delayed_job 2016-03-13 10:42:55 +11:00
Connor Turland 11e57c1b37 rebase onto develop which now has API and pundit 2016-03-13 10:36:38 +11:00
Connor Turland e6017c4129 Merge remote-tracking branch 'origin/feature/pundit' into feature/api.pundit 2016-03-12 07:19:19 +11:00
Connor Turland 059591b78b first pass at important API endpoints, token auth 2016-03-11 17:16:04 +11:00
Devin Howard cec6d3bfcd handle pundit errors with http 403 2016-02-28 13:24:55 +08:00
Devin Howard 8ef847bd6d factor maps#index into 4 separate functions 2016-02-28 12:30:41 +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 0e7b01296a dotenv.load in application.rb now 2016-01-08 08:19:46 +08:00
Devin Howard 1c0f6f2e2a don't put RAILS_ENV into the .env file - chicken and egg 
see https://github.com/bkeepers/dotenv/issues/19 for more info
 2016-01-07 18:47:58 +08:00
Devin Howard e21096f00a initializers for .env 2016-01-07 18:34:24 +08:00
Devin Howard c6b0ccdbdb database name configurable in .env 2016-01-07 18:29:15 +08:00
Devin Howard 4842856358 merge develop into rspec-tests 2016-01-07 16:04:23 +08:00
Devin Howard 7d7003a1bc get more hard headed about having development values in .example-env 2016-01-06 23:16:34 +08:00
Devin Howard bf21dcc3e6 merge develop into rspec tests 2016-01-06 23:03:34 +08:00
Devin Howard 3cdab531a6 move more config into .example-env 2016-01-06 22:57:01 +08:00
Devin Howard 70f5a5db11 centralize config in .env file, which includes remaving database.yml.default and overriding that file's local changes in favour of env variables. In future, all instance config can go in .env 2016-01-06 22:36:29 +08:00
Devin Howard 21aba2fe5e more modular database.yml.default 2015-12-24 16:36:58 +08:00
Connor Turland 49dd2f2e92 merge develop 2015-12-22 13:16:03 -05:00
Devin Howard 914ff46bb9 syntax error in development.rb 2015-12-21 11:40:30 +08:00
Devin Howard f35d4d51a9 s3 over https by default 2015-12-20 20:19:09 +08:00
Devin Howard 2525a6fb65 add permission service, refactor map model a bit, add validations 2015-12-17 09:10:52 +08:00
Devin Howard 235d4f6c24 remove unneeded NEW tests, fix test.rb environment 2015-12-15 22:33:48 +08:00
Connor Turland 089528c46d great progress 2015-12-11 14:23:41 -05:00
Devin Howard 1597665be5 merge develop with rails4 stuff 2015-12-07 13:58:42 +08:00
Connor Turland dcbe24bb7e getting uploads working 
followed what it said to do here: http://stackoverflow.com/questions/28374401/nameerror-uninitialized-constant-paperclipstorages3aws
 2015-12-03 16:57:30 -05:00
Devin Howard f4456d06ef fix devise integration for rails 4 2015-12-03 16:57:29 -05:00
Devin Howard 20e698f69d devise locale text 2015-12-03 16:57:29 -05:00
Devin Howard 6df2f22080 update devise.rb with new changes 2015-12-03 16:57:29 -05:00
Devin Howard 3674aefb04 remove secrets.yml stuff because it doesn't work with heroku 2015-12-03 16:57:29 -05:00
Devin Howard 570fa931b7 use secrets.yml to allow overriding config variables 2015-12-03 16:57:28 -05:00
Devin Howard 8e427ea8f2 add secrets.yml.default 2015-12-03 16:57:28 -05:00
Devin Howard a972074306 environment assets config 2015-12-03 16:57:27 -05:00
Devin Howard bd60f68cfe try to compile but not compress assets 2015-12-03 16:57:26 -05:00
Connor Turland 1a01d3b568 configuration for production environments like heroku 2015-12-03 16:57:23 -05:00
Connor Turland 8b7ec73f48 this enables the vagrant port forwarding 2015-12-03 16:57:23 -05:00
Devin Howard 50d9866939 fix problem with join route 2015-12-03 16:57:23 -05:00
Devin Howard 919fc0a60f fiddle with topic and mapping controllers so they work again 2015-12-03 16:57:23 -05:00
Devin Howard 13b70be653 secret_token => secret_key_base 2015-12-03 16:57:22 -05:00
Devin Howard 61159dc44c remove match method from routes.rb 2015-12-03 16:57:22 -05:00
Devin Howard 558ced62a8 asset precompiling simpler in rails 4 2015-12-03 16:57:22 -05:00
Devin Howard 62e96d574c some config changes for rails 4 found on the Internet 2015-12-03 16:57:21 -05:00
Connor Turland 1bbaa47b80 getting uploads working 
followed what it said to do here: http://stackoverflow.com/questions/28374401/nameerror-uninitialized-constant-paperclipstorages3aws
 2015-11-07 01:33:18 +08:00
Devin Howard 62ae38e70d fix devise integration for rails 4 2015-11-03 20:56:50 +08:00
Devin Howard 9613145e99 devise locale text 2015-11-02 00:07:52 +08:00
Devin Howard c86422dc68 update devise.rb with new changes 2015-11-02 00:05:57 +08:00
Devin Howard 6487202e6f remove secrets.yml stuff because it doesn't work with heroku 2015-10-30 14:30:24 +08:00
Devin Howard 8e1ae0a1fc use secrets.yml to allow overriding config variables 2015-10-29 16:23:41 +08:00
Devin Howard 5c813beafe merge 2015-10-27 18:20:12 +08:00
Devin Howard 12c6765f8b add secrets.yml.default 2015-10-27 18:17:04 +08:00
Devin Howard e40f6ededc environment assets config 2015-10-25 17:09:57 +08:00
Devin Howard ac0faae843 try to compile but not compress assets 2015-10-25 16:51:47 +08:00
Devin Howard 25117cf0e6 add rspec scaffold tests and a test db environment 2015-10-12 11:45:59 +08:00
Connor Turland f5dbfd5d72 configuration for production environments like heroku 2015-09-19 14:10:43 -04:00
Connor Turland 869fb816e9 this enables the vagrant port forwarding 2015-09-19 13:16:07 -04:00
Devin Howard 1fbd16ac95 fix problem with join route 2015-09-19 20:46:10 +08:00
Devin Howard e14001061c fiddle with topic and mapping controllers so they work again 2015-09-19 20:01:44 +08:00
Devin Howard f81fdbf8cc secret_token => secret_key_base 2015-09-10 22:12:39 +08:00
Devin Howard 7a73f3bc07 remove match method from routes.rb 2015-09-10 22:06:58 +08:00
Devin Howard c250f5d395 asset precompiling simpler in rails 4 2015-09-10 22:03:39 +08:00
Devin Howard 3c0bdff823 some config changes for rails 4 found on the Internet 2015-09-10 17:43:58 +08:00
mix irving c17cc39880 extract email settings into ENV ✂️ fixes #405 2015-03-04 11:30:23 +13:00
Connor Turland d08774d8bc changed user image settings. added mapper profile page 2014-11-25 15:06:30 -05:00
Connor Turland 2de697bcca ensured that new users can sign up with other new users invite codes 2014-11-21 17:24:08 -05:00
Connor Turland 951bd8d4a5 removed sidekiq leftovers. altered synapse results to only return unique 2014-11-16 12:35:06 -05:00
Connor Turland 8d3de3867f enabled pulling in siblings through right click menus in topic view 2014-11-11 06:48:21 -05:00
Connor Turland 44923eb660 added new map screenshot capture method 2014-11-09 22:10:13 -05:00
Connor Turland ee1ca7853f removed embed. fixed switch metacode set lightbox overflow. disabled topic creation and topic deletion from public maps by non-owner 2014-11-03 08:46:22 -05:00
Connor Turland 12e65c638b changes for reset password form 2014-10-27 18:24:30 -04:00
Connor Turland 1aaecd0a8f improved sign up error display, fixed styling for firefox, fixed page stuck on loading spinner bug 2014-10-24 11:30:26 -04:00
Connor Turland bac631ba73 config sidekiq 2014-10-08 01:42:16 -04:00
Connor Turland cf01e711dd merge with devin 2014-10-07 19:19:24 -04:00