Commit Graph
4359 Commits
Author SHA1 Message Date
E Rasche 41461235b2 rebuild client 2017-08-10 17:55:12 +02:00
E Rasche 61a5b7c9e1 another merge 2017-08-10 17:53:03 +02:00
E Rasche 7c1c60d826 forgot static files 2017-08-10 17:53:02 +02:00
E Rasche fb78a2118d merge 2017-08-10 17:53:02 +02:00
guerler cfa3220d9f Merge branch 'dev' into revise_page 2017-08-09 17:33:28 -04:00
Martin Cech fd0ce1284a make client again... 2017-08-09 16:05:20 -04:00
Martin Cech cff21d350d Merge branch 'dev' into library_tags 2017-08-09 16:03:29 -04:00
Martin Cech 06c70d34e2 make client 2017-08-09 16:02:47 -04:00
guerler 8f056c2bbc Merge branch 'dev' into revise_page 2017-08-09 12:32:30 -04:00
John Chilton b17091a3ec CSRF protection for login, logout, and user registeration.
The approach is to use per-session CSRF tokens - this avoids many complications related to per-form tokens. We generate a sequence of hashes based on session IDs that doesn't follow the same pattern as normal database API IDs by supplying a "kind" parameter to encode_id (we use the same pattern for securing the job files API for Pulsar).
2017-08-04 11:52:13 -04:00
guerler 88b8016b46 Merge branch 'dev' into revise_page 2017-08-03 18:24:37 -04:00
Aysam Guerler dbd057f9d7 Merge pull request #4371 from mvdbeek/fix_run_from_workflow_editor
Fix URL for workflow editor 'Run' button
2017-08-03 18:20:15 -04:00
guerler 2626eec1ab Use regular anchors for masthead routes 2017-08-03 18:14:56 -04:00
John Chilton fe3fdc82d2 Merge pull request #4369 from mvdbeek/tag_removal
Allow removal of dataset tags in workflows
2017-08-03 10:04:50 -04:00
mvdbeek 32bd350fe9 Fix URL for workflow editor 'Run' button
On the current dev this would point to api/workflows//download?style=run
and result in `Error occurred while loading the resource.`
2017-08-03 10:52:35 +02:00
guerler 11244ac2ee Escape grid messages 2017-08-02 16:07:38 -04:00
guerler f800b38dbd Merge branch 'dev' into revise_page 2017-08-02 16:05:20 -04:00
mvdbeek 910e6fa035 Allow removal of dataset tags in workflows
This adds a RemoveTagDatasetAction PJA, which removes user-specified
tags if they exist. Fixes
https://github.com/galaxyproject/galaxy/issues/4362
2017-08-02 20:50:55 +02:00
guerler e952a45af9 Reset url parameters when pushing new states 2017-08-01 15:16:38 -04:00
guerler 068ff8c55d Use router to load grid, avoids page refresh 2017-08-01 13:10:37 -04:00
guerler 1f27ad541d Fix url parameter forwarding to grid view 2017-08-01 12:31:22 -04:00
guerler b3e095d66c Parse url parameters for all client apps 2017-08-01 12:03:55 -04:00
guerler 41a2904128 Merge branch 'dev' into revise_page 2017-08-01 09:58:04 -04:00
anuprulez 7fe464c821 Merge with dev 2017-08-01 13:59:21 +02:00
anuprulez 826f53d8ad Removing the configure menu link from user preferences 2017-08-01 13:44:00 +02:00
anuprulez ec4d6c0c56 Removing the unencoded workflow id from the api and UI 2017-08-01 13:12:44 +02:00
anuprulez 8502a6854a Updating the dataset id 2017-07-31 16:46:50 +02:00
anuprulez f8e6fcaebc Removing unsued self vars and using just Backbone.Model 2017-07-30 23:14:34 +02:00
anuprulez 02c40bbcbe Fix review comments: removing self from multiple places and correct '>' 2017-07-30 19:06:46 +02:00
guerler ba0cb1d605 Only initialize router if passed 2017-07-28 15:30:26 -04:00
anuprulez 33cc830fb1 Adding comments 2017-07-28 13:41:25 +02:00
anuprulez 8010cd351d Removing the view for configure workflow menu 2017-07-28 13:33:13 +02:00
anuprulez 6d3b11f3e7 Moving show workflows in tools panel feature to workflow main view 2017-07-27 19:55:05 +02:00
guerler 149de8b44f Fix request submission 2017-07-26 12:41:07 -04:00
guerler 3829d3dea5 Add support for redirecting multiple select operations to the client instead of redirecting through controller 2017-07-25 15:18:33 -04:00
anuprulez 8fa3b2b97a Fixing PR review comments 2017-07-25 00:25:44 +02:00
anuprulez ac6ad5aaba Update the help text 2017-07-23 20:51:11 +02:00
anuprulez 9c83253c41 Changes for setting values of select box in metadata 2017-07-23 20:07:18 +02:00
anuprulez 9853625e90 Merge with def 2017-07-20 21:11:12 +02:00
anuprulez 212ffc7476 Add metadata fields 2017-07-20 18:49:59 +02:00
guerler c95ea0956f Move user list endpoint to admin controller 2017-07-19 16:40:49 -04:00
guerler 770deb58f0 Use transformed user grid list endpoint 2017-07-19 16:17:42 -04:00
guerler f74947b816 Used shared base router for admin and analysis app
Repack scripts
2017-07-19 16:10:34 -04:00
guerler 2671f2ae01 Add shared base router 2017-07-19 16:03:43 -04:00
guerler 0679534a1f Load grid client 2017-07-19 15:13:11 -04:00
guerler e5e390d829 Create admin specific client router 2017-07-19 15:10:10 -04:00
Dannon Baker fe038dcb4e Merge remote-tracking branch 'guerler/grid_saved_viz' into dev
Rebuild and package-lock update.
2017-07-19 09:28:28 -04:00
anuprulez 44d24c39f7 Add form builder for the attributes tab 2017-07-17 23:22:51 +02:00
guerler 3bf019b03e Merge branch 'dev' into grid_saved_viz 2017-07-17 12:18:48 -04:00
anuprulez 69934d9f02 Merging with dev 2017-07-17 15:55:36 +02:00