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

232 commits

Author SHA1 Message Date
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
Devin Howard
c5601686c2 actually commented sidekiq route 2014-10-07 19:01:41 -04:00
Devin Howard
f7f17a2908 added sidekiq gem and a route to /sidekiq (commented) for devel 2014-10-07 19:00:55 -04:00
Connor Turland
9a250d0034 got redirect for single sign on with uservoice working 2014-10-07 18:38:33 -04:00
Connor Turland
629a6a4172 fixed sign in redirects 2014-10-07 17:46:09 -04:00
Connor Turland
9ba6daec90 further fixed uservoice to identify user 2014-10-07 15:39:11 -04:00
Connor Turland
b5068b6bc4 finalized uservoice config 2014-10-07 15:19:10 -04:00
Connor Turland
d2760b8688 change in embedly 2014-09-09 18:17:39 -04:00
Connor Turland
6eca81487a started styling of map cards and topic card, removed new maps section 2014-08-15 18:04:22 -04:00
Connor Turland
6422b54dc0 clickable map cards 2014-08-12 18:14:04 -04:00
Connor Turland
bbc50d1305 got radial view working 2014-08-11 18:57:34 -04:00
Connor Turland
34500b3255 little fix for Util.splitLine 2014-08-10 19:44:53 -04:00
Connor Turland
341f9b9bdd home page styling 2014-08-10 19:13:25 -04:00
Connor Turland
06b35e550d first draft of explore maps working 2014-08-10 13:06:58 -04:00
Connor Turland
e7a445423d work in progress on explore maps pages 2014-08-06 10:09:01 -04:00
Connor Turland
3476d0126c got rgraph working again 2014-07-30 21:10:10 -04:00
Connor Turland
e702f7023f renamed application to not be ISSAD, now Metamaps 2014-07-30 01:24:20 -04:00
Connor Turland
ae8c711d27 major code refactor 2014-07-29 13:34:10 -04:00
Connor Turland
b06f5cae35 huge refactor 75% done 2014-07-27 15:57:35 -04:00
Connor Turland
96197130e1 added rmagick and ruby number for heroku 2014-07-07 21:02:43 -04:00
Connor Turland
e67a520a24 added EsC key to cancel search 2014-06-11 19:18:59 -04:00
Connor Turland
a46d097da9 ability to switch metacode sets from mapping page 2014-06-04 15:24:16 -04:00
Connor Turland
1970f794c4 code cleaning 2014-05-30 11:00:31 -04:00
Connor Turland
f121661858 merge changes on user settings page 2014-05-30 09:25:29 -04:00