Connor Turland
|
9b0ead24a3
|
more merges with develop
|
2017-02-05 06:37:37 +00:00 |
|
Connor Turland
|
3a4fa90c49
|
Merge branch 'develop' into feature/convo.algo
|
2017-02-05 06:28:49 +00:00 |
|
Connor Turland
|
3ae4072b5d
|
add ability to keep metacode focus
|
2017-02-05 06:28:10 +00:00 |
|
Connor Turland
|
bf9b25da9f
|
merge develop
|
2017-01-04 10:50:59 -05:00 |
|
Devin Howard
|
0960159265
|
Mailboxer notification pagination
|
2016-12-16 16:23:49 -05:00 |
|
Devin Howard
|
85408a14d3
|
Initial notification centre using mailboxer
|
2016-12-16 16:20:53 -05:00 |
|
Devin Howard
|
0ace202ace
|
automatic rubocop updates
|
2016-09-24 11:00:46 +08:00 |
|
Connor Turland
|
5d04d16590
|
create MetacodeSelect component
|
2016-09-18 15:22:51 +00: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
|
36c5ddab1f
|
before_filter => before_action
|
2016-02-28 17:48:18 +08: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
|
fa017a8559
|
sandi metz function simplification
|
2015-11-06 17:08:42 +08:00 |
|
Devin Howard
|
62ae38e70d
|
fix devise integration for rails 4
|
2015-11-03 20:56:50 +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
|
c361349c20
|
add required params to all controllers
|
2015-09-19 16:26:34 +08:00 |
|
Devin Howard
|
dc51d0080e
|
remove attr_accessible
|
2015-09-10 22:12:50 +08:00 |
|
Connor Turland
|
d08774d8bc
|
changed user image settings. added mapper profile page
|
2014-11-25 15:06:30 -05: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
|
6422b54dc0
|
clickable map cards
|
2014-08-12 18:14:04 -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
|
a46d097da9
|
ability to switch metacode sets from mapping page
|
2014-06-04 15:24:16 -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
|
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
|
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
|
9160ae305e
|
finished devins piece editing synapse directionality
|
2013-02-03 21:12:15 -05:00 |
|
Devin Howard
|
dfa2b2eb83
|
merged in changes from github and merged with synapse editng code
|
2013-01-30 19:51:55 -05:00 |
|
Connor Turland
|
b358f3dc5b
|
fixed login bug
|
2013-01-26 00:46:03 -05:00 |
|
Connor Turland
|
a0f638c10c
|
added ability to switch what metacodes you are mapping with
|
2013-01-25 20:49:40 -05:00 |
|
Devin Howard
|
c9614e33e3
|
removed buggy line from users_controller preventing people from joining (?) Or just Ishan's friends?
|
2013-01-24 19:51:51 -05:00 |
|
Connor Turland
|
1633b61637
|
permissions not fully fully functional yet, don't push to staging. editing of maps as cards in place. raw data available as json at maps/:id/json, or topics/:id/json, or synapses/:id/json
|
2013-01-18 17:08:06 -05:00 |
|
Connor Turland
|
1b44175c31
|
added home page with recent info, and personal profiles with recent indo
|
2013-01-07 23:03:41 -05:00 |
|
Connor Turland
|
3ee2921ae4
|
updating user profile pages
|
2013-01-07 19:57:04 -05:00 |
|
Connor Turland
|
3931fdd40e
|
got Rgraph working
|
2012-12-16 15:00:43 -05:00 |
|
Devin Howard
|
c523c17111
|
changed our syntax so that the find :first commands actually work :)
|
2012-11-03 13:57:42 -04:00 |
|
Devin Howard
|
77420bcb09
|
made feedback and metamaps manual display conditional instead of hard coded so there's not errors on a blank database
|
2012-11-03 13:45:08 -04: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 |
|
Connor Turland
|
402786a7c6
|
removed extra migrate file and made user show profile correctly
|
2012-10-26 06:59:45 -04:00 |
|
Connor Turland
|
112708eb52
|
made show user show whoevers page you're on
|
2012-10-26 06:43:01 -04:00 |
|
Connor Turland
|
5c195bd548
|
added maps, permissions, show user cards
|
2012-10-26 06:04:52 -04:00 |
|
Connor Turland
|
8f3164027b
|
added all files
|
2012-09-22 22:39:12 -04:00 |
|