Commit graph

124 commits

Author SHA1 Message Date
Devin Howard
44e8b8d581 Merge branch 'master' into thevalueweb 2015-06-03 18:14:05 -04:00
mix irving
c17cc39880 extract email settings into ENV ✂️ fixes #405 2015-03-04 11:30:23 +13:00
Connor Turland
1b5ac1dafa merged develop into thevalueweb 2014-12-03 08:26:11 -05:00
Connor Turland
d08774d8bc changed user image settings. added mapper profile page 2014-11-25 15:06:30 -05:00
Connor Turland
54bb3d2c3d updated the 404 page. fixed merge conflicts. removed generation code 2014-11-23 22:58: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
70cf1426d7 fixed merges from develop 2014-11-11 07:05:31 -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
ac951e52fb changed email config for tvw 2014-10-27 18:32:41 -04:00
Connor Turland
54584fb064 Merge branch 'develop' into tvw 2014-10-27 18:24:50 -04:00
Connor Turland
12e65c638b changes for reset password form 2014-10-27 18:24:30 -04:00
Connor Turland
75c286ecc6 merged develop fixes 2014-10-24 11:31:39 -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
37455abfe9 removed lightboxes, password protected 2014-10-18 19:26:34 -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
Raymon Johnstone
2a59d67d79 removed extra files 2014-05-17 16:10:44 -04:00
Raymon Johnstone
b9b226fea6 removed extra files 2014-05-17 16:04:23 -04:00
Connor Turland
72b3ae625b made all changes for heroku 2014-05-17 15:02:48 -04:00
Connor Turland
48dc11b53d added ability for an admin to add metacodes and metacode sets 2014-05-17 14:57:03 -04:00
Raymon Johnstone
dc6295328a Fixed issue where setting your settings would log you out. 2014-05-15 18:28:30 -04:00
Raymon Johnstone
0e25fb4cdb removed backup files as well as further mods for settings page 2014-05-14 16:51:16 -04:00
Connor Turland
8c1c4e3202 fixed registration issues 2014-03-03 10:28:16 -08:00
Connor Turland
672ebb99e2 changes for live site 2014-03-03 01:22:08 -08:00