Commit graph

22 commits

Author SHA1 Message Date
Connor Turland
49dd2f2e92 merge develop 2015-12-22 13:16:03 -05:00
Devin Howard
c58b2c805e syntax error 2015-12-21 21:38:02 +08:00
Devin Howard
e2bf1d5eb1 try to make metamaps more tls friendly 2015-12-20 18:36:57 +08:00
Connor Turland
87389a88ed current_user can be nil 2015-12-03 16:57:29 -05:00
Devin Howard
75700f06a9 make invite link use REQUEST_URI 2015-12-03 16:57:29 -05:00
Devin Howard
7d738b7abf fix map/mapping associations that I broke 2015-12-03 16:57:22 -05:00
Connor Turland
86c467b2f1 current_user can be nil 2015-11-04 00:14:14 -05:00
Devin Howard
660ee52292 make invite link use REQUEST_URI 2015-11-03 22:22:53 +08:00
Devin Howard
2f9b09db86 fix map/mapping associations that I broke 2015-09-19 16:48:24 +08:00
Connor Turland
a7328526a8 got profile picture uploading working, as well as profile picture removing, as well as password changing 2014-10-21 20:31:59 -04:00
Connor Turland
a8d173ff1d made http protocol for uservoice redirect consistent 2014-10-07 18:49:14 -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
48dc11b53d added ability for an admin to add metacodes and metacode sets 2014-05-17 14:57:03 -04:00
Connor Turland
8c1c4e3202 fixed registration issues 2014-03-03 10:28:16 -08:00
Connor Turland
4362e4f126 set the background back to normal, fixed the user sign up issue 2014-02-26 11:53:20 -08:00
Connor Turland
efcc449471 fixed issue where settings page was redirecting to nonexistent user profile page 2014-01-28 23:53:13 -05:00
Connor Turland
414e59e280 this is a lot of changes. too many to say here, oops 2014-01-28 22:46:58 -05:00
Connor Turland
41044140b7 added completely new logging in system 2013-07-10 14:02:38 -04:00
Connor Turland
baf440afda debugged users/new issue. I was logged in and trying to navigate to that page, and it was trying to redirect to a page that doesn't exist anymore. 2012-10-29 14:21:36 -04:00
Connor Turland
f3ee998eee set not authenticated to redirect to login 2012-09-23 21:38:26 -04:00
Connor Turland
8f3164027b added all files 2012-09-22 22:39:12 -04:00