Commit Graph
27916 Commits
Author SHA1 Message Date
guerler 2c3b4993cd Remove admin index mako 2017-05-15 09:13:41 -04:00
guerler 7de2b6b6ed Add conditions and additional attributes 2017-05-15 09:13:03 -04:00
guerler e64c195ffc Load initial page 2017-05-15 08:35:20 -04:00
guerler 25eb885097 Add additional properties 2017-05-15 08:27:05 -04:00
guerler b92099611c Remove debug statement 2017-05-15 07:51:10 -04:00
guerler d131e1bd6c Convert definitions into collection 2017-05-15 07:49:29 -04:00
guerler dcf177f212 Add all admin panel links 2017-05-15 07:46:39 -04:00
guerler ee676aef42 Add tool shed related menu items 2017-05-15 00:59:00 -04:00
guerler 6d19f59596 Prepare model structure for categories 2017-05-15 00:45:37 -04:00
guerler a00f7f6513 Insert admin app, redirect controller 2017-05-15 00:18:28 -04:00
Dannon Baker aab8833424 Merge commit 'e49e5e5417e8e2ebc0347b9cbbdf91c52d4779eb' into dev 2017-05-12 09:43:53 -04:00
guerler e49e5e5417 Fix test cases 2017-05-12 03:46:47 -04:00
Nicola Soranzo 2eeabc00b1 Merge branch 'release_17.05' into dev
Conflicts:
	static/scripts/bundled/analysis.bundled.js
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js
	static/scripts/bundled/libs.bundled.js.map
2017-05-11 19:30:20 +01:00
guerler 500ae33e1f Fix router 2017-05-11 14:28:23 -04:00
guerler fad855d29b Make client 2017-05-11 14:26:45 -04:00
guerler b3529e78c0 Merge branch 'dev' into refactor_panels_000 2017-05-11 14:19:37 -04:00
Nicola Soranzo 9940ae7030 Merge branch 'release_17.01' into release_17.05 2017-05-11 18:23:52 +01:00
John Chilton b7a66f182e Merge pull request #4055 from dannon/s3_objs_fix
[17.01] Fix for s3objectstore _clean_cache method
2017-05-11 13:17:03 -04:00
Dannon Baker 3e079a9f2c Fix for s3objectstore _clean_cache method, thanks to @zzsoni and @nsoranzo 2017-05-11 12:26:42 -04:00
Dannon Baker 2f6d9590fe Merge pull request #4047 from bgruening/workflowexport_mako
New Workflow Management Screen UI using JavaScript
2017-05-11 12:24:22 -04:00
anuprulez e74653feac Merging with dev 2017-05-11 17:11:40 +02:00
anuprulez a72035b497 Removing unused imports in workflow main view 2017-05-11 17:03:39 +02:00
Nicola Soranzo 163de025a2 Merge pull request #4053 from jmchilton/selenium_fixes_13
Reset Selenium test connection between test retries.
2017-05-11 15:45:19 +01:00
Dannon Baker 09e018d3e6 Merge #4051 and rebuild client 2017-05-11 10:40:10 -04:00
Björn Grüning 6f89baba42 Merge pull request #35 from dannon/workflowexport_mako
Fix require inclusion scoping in analysis.js
2017-05-11 16:34:00 +02:00
Dannon Baker 2e34b6c3e3 Fix require inclusion scoping in analysis.js 2017-05-11 10:27:56 -04:00
John Chilton 650691c943 Merge pull request #4052 from dannon/1705_fix_tag_drag
[17.05] Fix destructive tag rerender to be a simpler, more precise html replacement.
2017-05-11 10:15:44 -04:00
John Chilton a8ddd73ab4 Reset Selenium test connection between test retries.
Otherwise the state of one test can affect the next attempt.
2017-05-11 09:57:46 -04:00
Björn Grüning 7374558ca5 Merge pull request #34 from jmchilton/workflowexport_mako_test_fixes
Fix Selenium test cases for JavaScript-izing workflow management.
2017-05-11 15:51:46 +02:00
John Chilton c76c588ed1 Fix Selenium test cases for JavaScript-izing workflow management. 2017-05-11 09:35:14 -04:00
anuprulez 004f843ba4 Removing list_for_run.mako and its corresponding method in workflow controller 2017-05-11 13:50:16 +02:00
anuprulez b6bf961cd7 Fixing for prefix url for actions in workflow controller 2017-05-11 13:28:34 +02:00
anuprulez b91729eaf6 Fixing review comments for proxy_prefix and 'All workflows' link in the tool panel 2017-05-11 00:02:46 +02:00
Dannon Baker ced568a9e5 Fix destructive tag rerender to be a simple replacement. Left the original template/render in place, we could refactor as this becomes more standardized. 2017-05-10 16:59:58 -04:00
Yvan Le Bras e1c3886651 French error 2017-05-10 22:12:44 +02:00
anuprulez e1d197b27e Fixing PR review comments 2017-05-10 17:55:17 +02:00
guerler 98b3227777 Return separate View component for Page module 2017-05-10 11:45:35 -04:00
anuprulez d5d10f0ef0 Merging with dev and resolving conflicts 2017-05-10 17:31:26 +02:00
anuprulez c825f45590 Merging the static files 2017-05-10 17:19:14 +02:00
Björn Grüning 70cc3ebb08 Merge pull request #4050 from dannon/locale_fixes
Minor fixes for new locales, rebuild of client.
2017-05-10 17:07:29 +02:00
Dannon Baker 3c36af078f Some cleanup, rebuild. 2017-05-10 10:06:14 -04:00
Dannon Baker f792da1ce2 Minor fixes for new locales, rebuild of client. 2017-05-10 09:28:00 -04:00
Dannon Baker 5e6f739fc1 Merge pull request #4045 from ValentinChCloud/dev
Tooltip translation . Add Deutsch,Spanish
2017-05-09 18:02:00 -04:00
anuprulez 822abebd9e Fixing PR review comments 2017-05-09 23:42:55 +02:00
anuprulez c0decb71db Fixing pylint comments for build failure 2017-05-09 20:29:12 +02:00
anuprulez 29ac63ac56 Deleting list.mako file and updating code for workflow run 2017-05-09 19:42:13 +02:00
anuprulez a99605d04a Merge branch 'dev' of https://github.com/bgruening/galaxy into workflowexport_mako 2017-05-09 18:07:46 +02:00
ValentinChCloud 355966504c Deutsch and Spanish translation 2017-05-09 17:37:52 +02:00
ValentinChCloud 3f632aaa5f Fr translation tooltip section 2017-05-09 17:36:40 +02:00
ValentinChCloud cdd988a68d Add tooltip to sentences to translate 2017-05-09 17:30:16 +02:00