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 |
|
Connor Turland
|
49dd2f2e92
|
merge develop
|
2015-12-22 13:16:03 -05:00 |
|
Devin Howard
|
ae1117338a
|
set up devise authentication more srsly. Still doesn't pass the test though haha
|
2015-12-16 22:16:02 +08:00 |
|
Devin Howard
|
b2aa2074a7
|
update generation calcuation code, incl. fix user signup bug
|
2015-12-15 12:33:22 +08:00 |
|
Connor Turland
|
3c9d722945
|
accept or reject video offers
|
2015-12-11 17:29:17 -05:00 |
|
Connor Turland
|
089528c46d
|
great progress
|
2015-12-11 14:23:41 -05:00 |
|
Devin Howard
|
b037c84f15
|
fix small error in user model
need to use the parent's generation to calculate generation!
|
2015-12-07 11:44:08 +08:00 |
|
Devin Howard
|
7336c262e3
|
fix up user model json output function
|
2015-12-03 16:58:21 -05:00 |
|
Devin Howard
|
4139c2c84a
|
syntax error
|
2015-12-03 16:57:30 -05:00 |
|
Devin Howard
|
67d4a2aa34
|
sandi metz function simplification
|
2015-12-03 16:57:30 -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
|
ede4e7a509
|
fix references to Rails.application.secrets
|
2015-12-03 16:57:28 -05:00 |
|
Devin Howard
|
570fa931b7
|
use secrets.yml to allow overriding config variables
|
2015-12-03 16:57:28 -05:00 |
|
Connor Turland
|
d8da2d93fd
|
updated files to use amazon assets
|
2015-12-03 16:57:28 -05:00 |
|
Devin Howard
|
b9ac614057
|
asset_path doesn't work in models
|
2015-12-03 16:57:26 -05:00 |
|
Devin Howard
|
cef83e1f3d
|
asset_path
|
2015-12-03 16:57:26 -05:00 |
|
Devin Howard
|
371851cb89
|
remove attr_accessible
|
2015-12-03 16:57:22 -05:00 |
|
Devin Howard
|
3aaf501b03
|
fix up user model json output function
|
2015-11-28 21:51:28 +08:00 |
|
Devin Howard
|
fe0d38ec67
|
syntax error
|
2015-11-07 01:34:08 +08:00 |
|
Devin Howard
|
fa017a8559
|
sandi metz function simplification
|
2015-11-06 17:08:42 +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
|
e2a8e0331d
|
fix references to Rails.application.secrets
|
2015-10-30 14:18:50 +08:00 |
|
Devin Howard
|
8e1ae0a1fc
|
use secrets.yml to allow overriding config variables
|
2015-10-29 16:23:41 +08:00 |
|
Connor Turland
|
6e79b58e16
|
updated files to use amazon assets
|
2015-10-27 21:46:07 -07:00 |
|
Devin Howard
|
837abbe9ee
|
asset_path doesn't work in models
|
2015-10-23 23:09:14 +08:00 |
|
Devin Howard
|
d539846c61
|
asset_path
|
2015-10-23 23:06:24 +08:00 |
|
Devin Howard
|
dc51d0080e
|
remove attr_accessible
|
2015-09-10 22:12:50 +08:00 |
|
Connor Turland
|
499f6349e6
|
add ability for admin to delete any topics and synapses
|
2015-04-28 18:43:47 -04: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
|
a9e488d9cb
|
NOTE: rake db:migrate required. added generation column to users
|
2014-11-21 16:50:42 -05:00 |
|
Connor Turland
|
c5907914e3
|
fixed user images, set up map updates for realtime
|
2014-11-04 12:37:17 -05: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
|
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
|
eedd3736cf
|
realtime and filter box styling
|
2014-09-03 19:05:25 -04:00 |
|
Connor Turland
|
6422b54dc0
|
clickable map cards
|
2014-08-12 18:14:04 -04:00 |
|
Connor Turland
|
173179d682
|
fixed filters, updated ruby models further for returning json
|
2014-08-12 12:01:01 -04:00 |
|
Connor Turland
|
e1fb72c2df
|
fixed user model and map models up
|
2014-08-12 11:09:53 -04:00 |
|
Connor Turland
|
eceb1174c3
|
removed ccircular image processor to test
|
2014-07-08 00:21:43 -04:00 |
|
Connor Turland
|
96197130e1
|
added rmagick and ruby number for heroku
|
2014-07-07 21:02:43 -04:00 |
|
Robert Best
|
2e5947a243
|
Fixes #312
|
2014-05-04 15:12:38 -04:00 |
|
Connor Turland
|
d3500b0ce9
|
adjusted user model to not prevent sign ups
|
2014-01-31 11:58:32 -05:00 |
|
Connor Turland
|
d6d428df60
|
perhaps fixed login error
|
2014-01-28 23:27:32 -05:00 |
|
Connor Turland
|
adcdea5d5e
|
fixed selecting things on the radial view, and the weird synapse autocomplete bug
|
2013-11-14 12:28:31 -05:00 |
|
Connor Turland
|
b218d898ea
|
added account creation again. fixed realtime bug, border radius on the menu, fixed menu on console
|
2013-07-11 11:13:27 -04:00 |
|
Connor Turland
|
41044140b7
|
added completely new logging in system
|
2013-07-10 14:02:38 -04:00 |
|
Connor Turland
|
a0f638c10c
|
added ability to switch what metacodes you are mapping with
|
2013-01-25 20:49:40 -05:00 |
|
Connor Turland
|
131e27aefe
|
converted all references to items to topics
|
2013-01-01 17:45:35 -05:00 |
|
Connor Turland
|
f3fb5c5326
|
added data columns to user for a unique access code that is theirs that they can give to others to invite them, and require people to give an access code to create an account.
|
2012-10-29 13:52:29 -04:00 |
|