Devin Howard
|
bb03b49d80
|
update main controller (searching) to use policies
|
2016-03-12 09:09:41 +08:00 |
|
Connor Turland
|
521aa6b5d0
|
function no longer exists
|
2016-03-12 11:58:26 +11:00 |
|
Connor Turland
|
a78312f90c
|
Merge branch 'feature/pundit' into feature/api.pundit
|
2016-03-12 11:49:41 +11:00 |
|
Connor Turland
|
d0aecc0b31
|
pundit: make it work
|
2016-03-12 11:47:24 +11:00 |
|
Connor Turland
|
dc6ccd2022
|
pundit: fixing up topics and synapses
|
2016-03-12 11:47:05 +11:00 |
|
Connor Turland
|
1cf3182e75
|
pundit: exclude topic action
|
2016-03-12 11:46:52 +11:00 |
|
Connor Turland
|
5f3f5212c5
|
pundit: syntax error
|
2016-03-12 11:46:18 +11:00 |
|
Connor Turland
|
d8c328468e
|
changess for pundit
|
2016-03-12 11:45:39 +11:00 |
|
Connor Turland
|
cb79f2deae
|
pundit: make it work
|
2016-03-12 11:16:46 +11:00 |
|
Connor Turland
|
bef21341c6
|
pundit: fixing up topics and synapses
|
2016-03-12 11:10:30 +11:00 |
|
Connor Turland
|
09a7b336bf
|
pundit: exclude topic action
|
2016-03-12 10:13:22 +11:00 |
|
Connor Turland
|
0095a8daf4
|
pundit: syntax error
|
2016-03-12 10:06:00 +11:00 |
|
Connor Turland
|
fc1a7fd23d
|
api: adjust serializers
|
2016-03-12 10:05:42 +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
|
e6017c4129
|
Merge remote-tracking branch 'origin/feature/pundit' into feature/api.pundit
|
2016-03-12 07:19:19 +11:00 |
|
Devin Howard
|
eb56755068
|
implement five policies into their controllers
|
2016-03-11 22:10:31 +08:00 |
|
Devin Howard
|
7395811ba5
|
handle unauthorized with baaaaad 403
|
2016-03-11 21:35:48 +08:00 |
|
Connor Turland
|
ccfba03fdb
|
clean up duplicate code
|
2016-03-11 17:26:54 +11:00 |
|
Connor Turland
|
059591b78b
|
first pass at important API endpoints, token auth
|
2016-03-11 17:16:04 +11:00 |
|
Connor Turland
|
616dc9ed0e
|
messages weren't being displayed in order
|
2016-03-01 12:55:00 +13:00 |
|
Connor Turland
|
c6fea78054
|
merge develop
|
2016-02-29 13:58:47 +13:00 |
|
Devin Howard
|
ef5d85c2bf
|
before_filter => before_action
|
2016-02-28 17:48:35 +08:00 |
|
Devin Howard
|
36c5ddab1f
|
before_filter => before_action
|
2016-02-28 17:48:18 +08:00 |
|
Devin Howard
|
895b872bda
|
remove unneeded https stuff
|
2016-02-28 17:15:09 +08:00 |
|
Devin Howard
|
25774d9f16
|
remove unneeded https stuff
|
2016-02-28 16:57:25 +08:00 |
|
Devin Howard
|
cbb6b648be
|
implement main_policy (headless). also remove all @current references
|
2016-02-28 16:53:59 +08:00 |
|
Devin Howard
|
bc7db85c8c
|
update map index views
|
2016-02-28 13:14:34 +08:00 |
|
Devin Howard
|
8ef847bd6d
|
factor maps#index into 4 separate functions
|
2016-02-28 12:30:41 +08:00 |
|
Devin Howard
|
66f1d2ec0b
|
install pundit
|
2016-02-28 12:30:41 +08: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
|
40a833b069
|
Merge pull request #473 from metamaps/feature/fix-invite-link
fix get_invite_link function. fixes #471
|
2016-02-21 15:22:34 +08:00 |
|
Devin Howard
|
e629a9bf71
|
fix get_invite_link function. fixes #471
|
2016-02-19 18:09:46 +08:00 |
|
Devin Howard
|
7b9c6459e3
|
allow embedding
|
2016-02-19 09:23:39 +08:00 |
|
Devin Howard
|
056ef2b5b6
|
smoother synapse creation with clicks/tabs
|
2016-02-14 15:19:35 +08:00 |
|
Devin Howard
|
6d0dcec1ba
|
mess with metacode tests
|
2016-02-09 12:43:34 +08:00 |
|
Devin Howard
|
43bdda61de
|
maps controller spec passes, 3 pending
|
2016-02-09 11:48:07 +08:00 |
|
Devin Howard
|
005250f330
|
typo
|
2016-02-09 11:26:42 +08:00 |
|
Devin Howard
|
0b98e446ca
|
fiddle with maps_controller code style
|
2016-02-09 11:20:04 +08:00 |
|
Devin Howard
|
cc99ed001d
|
fix mapping_controller_spec.rb
|
2016-02-08 11:19:38 +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
|
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
|
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 |
|
Devin Howard
|
4dbff85443
|
default value if no request.env in application controller passes the rspec test woot. Only 80 more tests to implement
|
2015-12-16 22:36:12 +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
|
be3924aa54
|
setup bare minimum devise authentication in tests
|
2015-12-16 21:32:50 +08:00 |
|
Devin Howard
|
6148f55e1c
|
handle nil unsafe_uri in app conttroller function
|
2015-12-16 21:05:18 +08:00 |
|
Connor Turland
|
089528c46d
|
great progress
|
2015-12-11 14:23:41 -05:00 |
|
Devin Howard
|
7db75b8d6d
|
more fixes
|
2015-12-03 16:57:30 -05:00 |
|
Devin Howard
|
67d4a2aa34
|
sandi metz function simplification
|
2015-12-03 16:57:30 -05: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
|
f4456d06ef
|
fix devise integration for rails 4
|
2015-12-03 16:57:29 -05:00 |
|
Devin Howard
|
0b96171aa3
|
bugfix
|
2015-12-03 16:57:27 -05:00 |
|
Devin Howard
|
d8dffad38a
|
metacodes#index map in asset_path
|
2015-12-03 16:57:27 -05:00 |
|
Devin Howard
|
c782c4d0bb
|
remove binding.pry
|
2015-12-03 16:57:26 -05:00 |
|
Devin Howard
|
52b37e7ac6
|
asset_path in css erb files
|
2015-12-03 16:57:26 -05:00 |
|
Devin Howard
|
566a0a3aa6
|
brute force prevent nil synapse descriptions
|
2015-12-03 16:57:25 -05:00 |
|
Devin Howard
|
617fe43f71
|
fix problem with mappings and forking maps
|
2015-12-03 16:57:25 -05:00 |
|
Devin Howard
|
ae16f8f08d
|
fix a few more mappable/topic/synapse things in JS
|
2015-12-03 16:57:24 -05:00 |
|
Devin Howard
|
3e8c971155
|
change from category/topic_id/synapse_id to mappable_type/mappable_id
|
2015-12-03 16:57:24 -05:00 |
|
Devin Howard
|
379b37b445
|
fix typo + debug statements to make existingSynapse autocomplete work
|
2015-12-03 16:57:24 -05:00 |
|
Devin Howard
|
4bc03e3d2a
|
code tweaks to searchsynapses
|
2015-12-03 16:57:24 -05:00 |
|
Devin Howard
|
e5c83a2a0c
|
dependent destroy models for topics/maps/synapses on mappings
|
2015-12-03 16:57:23 -05:00 |
|
Devin Howard
|
7c28070978
|
fix other controllers needing create/update changed for rails 4
|
2015-12-03 16:57:23 -05:00 |
|
Devin Howard
|
919fc0a60f
|
fiddle with topic and mapping controllers so they work again
|
2015-12-03 16:57:23 -05:00 |
|
Devin Howard
|
7877e5bdbc
|
delete_if threw errors, so convert things to arrays for it
|
2015-12-03 16:57:22 -05:00 |
|
Devin Howard
|
7d738b7abf
|
fix map/mapping associations that I broke
|
2015-12-03 16:57:22 -05:00 |
|
Devin Howard
|
e9cb8561fa
|
add required params to all controllers
|
2015-12-03 16:57:22 -05:00 |
|
Devin Howard
|
371851cb89
|
remove attr_accessible
|
2015-12-03 16:57:22 -05:00 |
|
Devin Howard
|
1f82238362
|
more fixes
|
2015-11-08 23:14:53 +08:00 |
|
Devin Howard
|
fa017a8559
|
sandi metz function simplification
|
2015-11-06 17:08:42 +08: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
|
62ae38e70d
|
fix devise integration for rails 4
|
2015-11-03 20:56:50 +08:00 |
|
Devin Howard
|
fb848b29d5
|
bugfix
|
2015-10-26 20:41:37 +08:00 |
|
Devin Howard
|
0dbb37eaa4
|
metacodes#index map in asset_path
|
2015-10-25 17:14:56 +08:00 |
|
Devin Howard
|
b00784731b
|
remove binding.pry
|
2015-10-23 23:42:21 +08:00 |
|
Devin Howard
|
46dd54a1d7
|
asset_path in css erb files
|
2015-10-23 23:34:18 +08:00 |
|
Devin Howard
|
96871cadab
|
brute force prevent nil synapse descriptions
|
2015-10-23 22:17:08 +08:00 |
|
Devin Howard
|
588b62b942
|
fix problem with mappings and forking maps
|
2015-10-23 22:07:44 +08:00 |
|
Devin Howard
|
85b3012cd9
|
fix a few more mappable/topic/synapse things in JS
|
2015-10-02 18:54:17 +08:00 |
|
Devin Howard
|
6d1e382d5c
|
change from category/topic_id/synapse_id to mappable_type/mappable_id
|
2015-10-02 16:32:16 +08:00 |
|
Devin Howard
|
120edfc278
|
fix typo + debug statements to make existingSynapse autocomplete work
|
2015-10-02 15:46:48 +08:00 |
|
Devin Howard
|
d895bca1a4
|
code tweaks to searchsynapses
|
2015-10-01 12:33:38 +08:00 |
|
Devin Howard
|
9e43cc2e96
|
dependent destroy models for topics/maps/synapses on mappings
|
2015-10-01 11:02:39 +08:00 |
|
Devin Howard
|
62035ed015
|
fix other controllers needing create/update changed for rails 4
|
2015-09-19 20:05:36 +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
|
6692c28965
|
delete_if threw errors, so convert things to arrays for it
|
2015-09-19 17:08:12 +08:00 |
|
Devin Howard
|
2f9b09db86
|
fix map/mapping associations that I broke
|
2015-09-19 16:48:24 +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
|
a048c87356
|
mapper who doesn't own a topic or synapse should not be able to delete it.
|
2015-01-28 22:35:03 -05:00 |
|
Connor Turland
|
cb3db06406
|
switched home page to active maps instead of my maps
|
2014-11-29 01:37:06 -05:00 |
|