Commit Graph
4556 Commits
Author SHA1 Message Date
Dannon Baker f9967fcebd Merges 17.09->dev and rebuilds client. 2017-10-03 12:39:09 -04:00
John Chilton fd90d76453 Cleanup delayed action in history-view.js.
Might fix #4698 but who knows.
2017-09-29 15:04:24 -04:00
guerler f97392c1db Merge branch 'dev' into replace_history_permission_form 2017-09-29 10:24:01 -04:00
Nicola Soranzo 95a5e8d6c8 Merge branch 'release_17.09' into dev
Conflicts:
	static/scripts/bundled/libs.bundled.js
	static/scripts/bundled/libs.bundled.js.map
2017-09-29 12:38:52 +01:00
guerler a5c83b3ce9 Use same push url format as in other push requests 2017-09-28 14:41:20 -04:00
guerler f88ce0b382 Merge branch 'dev' into replace_history_permission_form 2017-09-28 14:37:20 -04:00
Dannon Baker 297cb2da4b Merge branch 'replace_page_edit_form' into dev 2017-09-28 12:57:20 -04:00
Nicola Soranzo f4941e5422 Merge branch 'release_17.09' into dev
Conflicts:
	static/scripts/bundled/admin.bundled.js
	static/scripts/bundled/admin.bundled.js.map
	static/scripts/bundled/analysis.bundled.js
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js.map
2017-09-28 16:52:46 +01:00
Dannon Baker d49c49d0ee Pull a minor cosmetic fix out of the urlFor refactoring. Might as well be consistent in the release. 2017-09-28 11:29:26 -04:00
guerler 958d917cb5 Display error message when workflow loading fails 2017-09-27 18:22:43 -04:00
Dannon Baker 266361d151 Minor formatting. 2017-09-27 17:51:46 -04:00
Dannon Baker 8820e3bc58 Rebuild client. 2017-09-27 17:47:53 -04:00
Dannon Baker fa4c1b5da7 More fixes for the workflow list page, and some general cleanup. 2017-09-27 17:45:17 -04:00
Dannon Baker 03394d44c9 Support workflow list messaging 2017-09-27 17:06:22 -04:00
guerler a8f59a46a9 Merge branch 'dev' into replace_page_edit_form 2017-09-27 15:35:02 -04:00
Nate Coraor 9a0511e883 Merge branch 'release_17.09' into dev 2017-09-27 15:15:01 -04:00
guerler 075c0a7684 Remove unused id parsing 2017-09-27 14:43:49 -04:00
guerler 361c0dc2ec Allow history dataset permissions modifications in saved histories grid 2017-09-27 14:16:51 -04:00
guerler 49ebf1261d Add client routes, link from history panel to controller endpoint for history permissions 2017-09-27 12:40:36 -04:00
Dannon Baker 146010fcbf Fix onload webhook call w/ Galaxy.root 2017-09-27 11:51:38 -04:00
Dannon Baker d214ccc0e4 Leading slash not required here 2017-09-27 11:23:22 -04:00
Dannon Baker 1676434ab5 Correct base route for workflows, allowing proxy-prefix to work. 2017-09-27 10:45:23 -04:00
Dannon Baker 319489c88e Merge branch 'release_17.09' into dev 2017-09-27 09:20:56 -04:00
Dannon Baker 40900d76a9 Re-enable keepalive, build client. 2017-09-27 07:54:27 -04:00
guerler e42dc9c8ca Add client side route to analysis app 2017-09-25 11:44:17 -04:00
guerler 8001299333 Fix url to pages edit controller endpoint 2017-09-24 14:03:10 -04:00
guerler 2d33cc2866 Add client routes for pages edit attribute form 2017-09-24 14:00:39 -04:00
guerler 1547d1b91e Add message handling support 2017-09-23 18:41:08 -04:00
guerler a373bbbfe5 Add client-side routes to connect visualization edit controller endpoint with front-end form builder 2017-09-23 18:18:41 -04:00
guerler 7921c8b896 Use client builder for history renaming form 2017-09-22 14:12:38 -04:00
guerler c9db5f8dfe Merge branch 'dev' into admin_grid_formbuilder 2017-09-18 10:24:23 -04:00
Evgeny Anatskiy f3c593fc59 fix column order in Custom Builds 2017-09-16 21:22:12 +02:00
Martin Cech 3b4bd3bb6f make client 2017-09-15 11:54:49 -04:00
Martin Cech 7d2cd22722 replace colon and comma in role names since they are also separators 2017-09-15 11:49:25 -04:00
Dannon Baker 0ea6272f5d More spelling. 2017-09-15 10:34:48 -04:00
Dannon Baker 7831b98898 Occurred, spelling. 2017-09-15 10:32:06 -04:00
Dannon Baker 1c1ca9bd91 Fix loose->lose in help text for library dataset view. 2017-09-15 10:26:07 -04:00
Martin Cech 9084edd820 fix typo
thanks @dannon
2017-09-14 14:03:31 -04:00
Martin Cech a1cd3bd1e4 rebuild client 2017-09-14 11:38:16 -04:00
Martin Cech d8dfbe56c4 unify library dataset permission frontend for all users
also refactor
2017-09-14 11:34:26 -04:00
guerler 9a348167ff Merge branch 'dev' into admin_grid_formbuilder 2017-09-14 10:07:47 -04:00
Dannon Baker 62e73a37d3 Merge remote-tracking branch 'upstream/dev' into fix_missing_histories 2017-09-14 08:21:54 -04:00
Eric Rasche cdb95d6045 Merge pull request #4594 from martenson/fix-search-pagination
Fix datalib search pagination
2017-09-14 10:39:36 +02:00
Dannon Baker 1502e00675 Some cruft fixing and configuring of Galaxy.debug output instead of commented out console.logs -- should help immensely for troubleshooting 2017-09-13 15:04:28 -04:00
Dannon Baker 4f93f88f0a Allow fetchMore to actually specify a 0 offset when intentional. This should fix the mysterious missing history in multiview bug. 2017-09-13 15:01:31 -04:00
Martin Cech ba3ffd82d3 rebuild client 2017-09-13 13:43:08 -04:00
Martin Cech d63601eacf fix the bug with accessing length instead of the variable itself 2017-09-13 13:41:04 -04:00
Martin Cech 1f69ae5d5b refactor few functionas and rename variables 2017-09-13 13:41:04 -04:00
Martin Cech e7696027e4 remove cruft 2017-09-13 13:40:57 -04:00
Martin Cech cdca22b33e rebuild client 2017-09-13 13:38:56 -04:00