Devin Howard
5851d57eef
Merge branch 'master' into develop
2016-11-09 09:29:30 -05:00
Devin Howard
3759851621
fix access#access route ( #926 )
2016-11-08 09:37:06 -08:00
Devin Howard
9df974a037
strip whitespace from search terms ( #919 )
2016-11-07 14:58:53 -05:00
Devin Howard
5e0e44b436
supercharge the schemas ( #874 )
...
* fix map schema - woot it works
* update other schemas to include embeddable attrs
* update current user schema/examples
2016-10-29 22:58:31 +08:00
Devin Howard
1fbfd56d57
filter maps by user_id in api ( #872 )
...
* filter maps by user_id in api
* test user_id map filter
* update starred maps example to make starred true lol
* add user id to map schema/examples
2016-10-29 22:07:27 +08:00
Devin Howard
a32f98bde2
to_json should be as_json or there's bugs ( #870 )
...
* to_json should be as_json or there's bugs
* revert explore controller, it's better without
* revert search controller and some topic methods
2016-10-29 18:28:29 +08:00
Devin Howard
e49e5c258a
make synapse permissions depend on topic1 and topic2 ( #839 )
...
* deep change to synapse policy - is this ok?
* make synapse policy resilient to nil topic1/topic2/map
* use a transaction to handle authorization vs invalid record in synapse controller
* more synapse controller tests
* inline documentation
* fix policy(Synapse).create?
2016-10-28 11:03:59 +08:00
Devin Howard
9d821c920b
reorder API authentication precedence to be: token, oauth, cookie ( #860 )
...
* reorder authentication to be: token, then oauth, then cookie
* all APIs but tokens are accessible anonymously (so add mappings to the list)
* fix mapping order
2016-10-28 10:51:58 +08:00
Devin Howard
175a3ee73e
policy_scope on has_many relationships in serializers ( #840 )
...
* token overrides current user in api
* policy scope has_many relationships
* fix hard coded topics - whoops
* handle policy_scope returning nil in application serializer
2016-10-26 19:56:30 +08:00
Devin Howard
fb6c8a74a7
scoping on topic json properties ( #813 )
2016-10-23 22:11:38 +08:00
Connor Turland
d359eb063a
fixed the oauth redirect bug and a bit more ( #796 )
2016-10-22 16:46:39 +08:00
Devin Howard
7f1c04015e
fix topic autocomplete controller action
2016-10-19 22:10:38 +08:00
Devin Howard
bb6566a45e
clean up and fix devise code
2016-10-19 12:40:52 +08:00
Connor Turland
4602ded8a4
access requests ( #762 )
...
* start on access requests
* set up access requests further
* set default values for approved and answered
2016-10-16 20:22:00 -04:00
Devin Howard
7eae8deacb
revamp HTML template a bit for api docs ( #757 )
...
* my_tokens endpoint moved to normal index
* remove secured_by from metacodes/users
* ch ch ch changes
* mess with template
* fix securedBy
* convenience open
* gross authentication notes at the top of every endpoint
* better ordering
* move login tutorials into security tab
* oauth tutorial
* getting closer
* remove unneeded Endpoints header
* ok looks OK
2016-10-12 13:54:43 -04:00
Devin Howard
9d85dab975
Merge pull request #747 from metamaps/fix/unauth-error
...
redirect to root_path if you get a 403
2016-10-08 14:16:13 +08:00
Devin Howard
9513087bbd
remove unnecessary api v1 code
2016-10-08 14:12:54 +08:00
Devin Howard
2c64b67abd
return 404s for all unmatched api routes
2016-10-08 13:58:19 +08:00
Devin Howard
129e3db946
redirect to root_path if you get a 403
2016-10-08 12:26:08 +08:00
Connor Turland
86a6e92bc3
dont show private maps in global collection ( #734 )
...
* dont show private maps in global collection
* Update explore_controller.rb
* Update main_controller.rb
2016-10-06 23:45:17 -04:00
Connor Turland
e72ae5df94
another issue from the maps in maps branch
2016-10-06 09:33:10 -04:00
Connor Turland
85dcad928f
enable pulling in of references to maps through typeahead ( #636 )
2016-10-06 09:12:01 -04:00
Devin Howard
d193c9a53c
add starred to maps API ( #719 )
...
* add starred to maps API and endpoint to create/delete
* add token to requests without token param
* add minor version number to api version
* metacode/user use uri in schema
* make code climate happier
2016-10-05 10:36:03 -04:00
Devin Howard
df29e48d8c
rubocop + allow unauthed users to see all users
2016-10-04 22:51:21 +08:00
Devin Howard
2eae89a6b7
users and metacodes api endpoints
2016-10-04 22:28:10 +08:00
Devin Howard
8afef1bc4a
make tokens description field optional
2016-10-04 16:08:07 +08:00
Devin Howard
3d7a2ef5b1
make raml traits work and be accurate/useful
2016-10-04 15:22:24 +08:00
Connor Turland
da3795a2c2
new map improvements ( #710 )
...
* prehighlight the text for editing when taken to a new map
* style
2016-10-02 22:49:45 -04:00
Devin Howard
7d0b56da19
Merge pull request #689 from metamaps/feature/user-in-slack-notification
...
Custom formatter for slack exception notifications
2016-10-03 08:26:13 +08:00
Devin Howard
87228a9631
delete old gems and upgrade aws/paperclip ( #676 )
...
* remove old gems from gemfile, upgrade aws/paperclip
* update paperclip config
* upload screenshots as a blob instead of base64 to maps controller
2016-10-02 18:29:35 -04:00
Devin Howard
afa4422608
Custom formatter for slack exception notifications
2016-10-02 17:07:45 +08:00
Devin Howard
7156fab3e2
fix topic controller bugs
2016-09-30 14:42:07 +08:00
Connor Turland
93341719a9
Update main_controller.rb ( #682 )
2016-09-28 20:22:55 -04:00
Devin Howard
db3cf0490f
fix develop branch bugs ( #679 )
...
* bugfix - rename SearchController so it works
* remove unneeded respond_with
* fix to_json calls
2016-09-29 08:02:25 +08:00
Devin Howard
9699b41159
make requestinvite controller method explicit
2016-09-28 22:29:53 +08:00
Devin Howard
5b9eedc830
pull search routes into their own controller
2016-09-28 22:29:53 +08:00
Devin Howard
5065655436
factor stars into their own controller
2016-09-28 22:27:32 +08:00
Devin Howard
3ee8d41298
maps controller code climate
2016-09-28 22:27:32 +08:00
Devin Howard
f75ad41a82
factor out map_scope function
2016-09-28 22:27:32 +08:00
Devin Howard
bb87c9c2db
simplify explore controller a bit
2016-09-28 22:27:32 +08:00
Devin Howard
a8b698b11c
Merge pull request #677 from metamaps/feature/node1-topic1-migration
...
node{1,2}_id => topic{1,2}_id migration and code changes
2016-09-28 22:26:50 +08:00
Devin Howard
743c9b3af9
node{1,2}_id => topic{1,2}_id migration and code changes
2016-09-28 10:35:14 +08:00
Devin Howard
a86101dda0
remove excel export
2016-09-27 21:10:14 +08:00
Devin Howard
b49cb7766a
Merge pull request #652 from metamaps/feature/explore-controller
...
refactor map controller
2016-09-25 23:47:22 +08:00
Devin Howard
03ba3a89f1
main controller renders by name
2016-09-25 23:37:08 +08:00
Devin Howard
50f98aebea
explore controller spec
2016-09-25 23:25:38 +08:00
Devin Howard
dad048eb20
rubocop
2016-09-25 23:25:38 +08:00
Devin Howard
b722d2d3b0
fix map controller create spec
2016-09-25 23:25:38 +08:00
Devin Howard
5e180ac10e
set up explore controller routes and rename methods
2016-09-25 23:25:38 +08:00
Devin Howard
686d80e274
move more logic into map model
2016-09-25 23:25:37 +08:00