Connor Turland
|
c4890274f2
|
switch messages to use pundit
|
2016-03-23 16:29:26 -07:00 |
|
Connor Turland
|
1ee33b843f
|
Merge branch 'develop' into feature/realtime.video
|
2016-03-14 21:40:25 +11:00 |
|
Connor Turland
|
3e24a088da
|
Merge branch 'develop' of github.com:metamaps/metamaps_gen002 into develop
|
2016-03-14 21:36:57 +11:00 |
|
Connor Turland
|
8bd032472d
|
topic related things weren't working at all
|
2016-03-14 21:36:34 +11:00 |
|
Devin Howard
|
d11f3923dd
|
remove unused has_viewable_synapses function
|
2016-03-14 14:34:36 +08:00 |
|
Connor Turland
|
604087c592
|
Merge branch 'develop' into feature/realtime.video
|
2016-03-14 10:45:16 +11:00 |
|
Harlan T Wood
|
3fbb3d1dc9
|
more token entropy
|
2016-03-13 00:56:10 -08:00 |
|
Connor Turland
|
72b2e8f8f2
|
doesn't look good for now, take it out, add it later
|
2016-03-13 11:58:09 +11:00 |
|
Connor Turland
|
77d69dd2a3
|
turns out we do need delayed_job
|
2016-03-13 11:56:18 +11:00 |
|
Connor Turland
|
11e57c1b37
|
rebase onto develop which now has API and pundit
|
2016-03-13 10:36:38 +11:00 |
|
Connor Turland
|
7f86810f62
|
remove things again not needed
|
2016-03-12 11:53:12 +11:00 |
|
Connor Turland
|
bef21341c6
|
pundit: fixing up topics and synapses
|
2016-03-12 11:10:30 +11:00 |
|
Connor Turland
|
450db5eb8d
|
changes for pundit
|
2016-03-12 09:37:32 +11:00 |
|
Connor Turland
|
669b337d04
|
changes for api
|
2016-03-12 09:37:18 +11:00 |
|
Connor Turland
|
059591b78b
|
first pass at important API endpoints, token auth
|
2016-03-11 17:16:04 +11:00 |
|
Connor Turland
|
c6fea78054
|
merge develop
|
2016-02-29 13:58:47 +13:00 |
|
Devin Howard
|
40cd1ebb5c
|
modify metacodes to instead have two fields, and validate that only one is present. Manual icons can be entered through rake tasks or on the rails console or in db seed
|
2016-02-25 14:49:48 +08:00 |
|
Devin Howard
|
295534e4ab
|
migrate to using aws/paperclip for metacodes. RUN RAKE TASK ON PRODUCTION
|
2016-02-23 14:58:20 +08:00 |
|
Devin Howard
|
b385efafa9
|
don't need xloc or yloc for Synapse mappings
|
2016-02-21 17:25:39 +08:00 |
|
Devin Howard
|
f9bcd33344
|
update synapses specs; all specs pass again. all models/controllers tested
|
2016-02-09 14:25:39 +08:00 |
|
Devin Howard
|
7f50db1ae9
|
ok metacode spec done
|
2016-02-09 13:30:49 +08:00 |
|
Devin Howard
|
43bdda61de
|
maps controller spec passes, 3 pending
|
2016-02-09 11:48:07 +08:00 |
|
Devin Howard
|
e460899ea3
|
testing simplecov and rcov stuff
|
2016-02-08 11:19:39 +08:00 |
|
Devin Howard
|
cc99ed001d
|
fix mapping_controller_spec.rb
|
2016-02-08 11:19:38 +08:00 |
|
Devin Howard
|
fa3a725df9
|
mapping spec
|
2016-02-08 11:19:37 +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
|
4469b29ec2
|
in user model
|
2016-01-07 15:32:19 +08:00 |
|
Devin Howard
|
bf21dcc3e6
|
merge develop into rspec tests
|
2016-01-06 23:03:34 +08:00 |
|
Connor Turland
|
49dd2f2e92
|
merge develop
|
2015-12-22 13:16:03 -05:00 |
|
Devin Howard
|
888edae6f6
|
finish remove asset_path_icon whoops
|
2015-12-20 22:28:05 +08:00 |
|
Devin Howard
|
96ec672779
|
Merge branch 'develop' into feature/rspec-tests
|
2015-12-20 22:24:39 +08:00 |
|
Devin Howard
|
df485002b1
|
remove redundant asset_path_icon function
|
2015-12-20 22:22:01 +08:00 |
|
Devin Howard
|
c4be57e525
|
topic and synapse validate permission
|
2015-12-18 09:25:54 +08:00 |
|
Devin Howard
|
006acac6b5
|
remove redundant authorize_to_view function
|
2015-12-17 23:20:19 +08:00 |
|
Devin Howard
|
d5f66487b7
|
update map spec - add authorize_to_delete. TODO: add other map authorize specs
|
2015-12-17 09:44:48 +08:00 |
|
Devin Howard
|
9e4a7b821f
|
cleanup topic model a bit
|
2015-12-17 09:34:49 +08:00 |
|
Devin Howard
|
696bac17e6
|
map spec
|
2015-12-17 09:16:02 +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
|
bfd4e4f228
|
add permission service, add validations to map.rb
|
2015-12-17 09:03:51 +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
|
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 |
|