opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
27,961 Commits 69 Branches 243 Tags
5eadd4842dcd2aedcc6a496d9bcaecd8048e4ead
Commit Graph
4081 Commits
Author SHA1 Message Date
Martin Cech 5eadd4842d Merge branch 'release_17.05' into dev 2017-05-16 15:55:16 -04:00
Martin Cech fc69a85100 add new translatable strings to the locale file 2017-05-16 13:30:22 -04:00
guerler 220fff9e9b Add localization support for admin panel labels 2017-05-16 12:49:04 -04:00
guerler a476db0253 Add active view attribute, add monitoring ids 2017-05-16 10:25:46 -04:00
Dannon Baker d3427a1344 Rebuild 2017-05-15 18:14:06 -04:00
guerler b2b84a8e62 Merge branch 'dev' into admin_app 2017-05-15 16:53:23 -04:00
guerler bd83608a2f Fix global grid action events 2017-05-15 14:21:17 -04:00
guerler fe59e3aeb4 Fix overlapping css tags 2017-05-15 10:20:37 -04:00
guerler 2399df09cc Remove unused parts, comments 2017-05-15 10:08:50 -04:00
guerler 866ddb4bcc Repack scripts 2017-05-15 09:39:57 -04:00
guerler f01c20fc7d Fix style 2017-05-15 09:38:08 -04:00
guerler 0423dbc890 Pack scripts 2017-05-15 09:14:48 -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
bagnacan 878c6657b4 conditional postclick execution onNext 2017-05-12 17:07:58 +02: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
John Chilton 04bb1e85cd [17.05] Fix FTP upload of multiple files in collection uploader. 2017-05-11 15:37:50 -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
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
Dannon Baker 09e018d3e6 Merge #4051 and rebuild client 2017-05-11 10:40:10 -04:00
Dannon Baker 2e34b6c3e3 Fix require inclusion scoping in analysis.js 2017-05-11 10:27:56 -04: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
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
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
anuprulez 822abebd9e Fixing PR review comments 2017-05-09 23:42:55 +02:00
anuprulez 29ac63ac56 Deleting list.mako file and updating code for workflow run 2017-05-09 19:42:13 +02:00
guerler 4c86628fdd Fix webhook access to masthead collection 2017-05-09 11:29:00 -04:00
guerler adc6ce5d4d Use local jquery selector 2017-05-09 00:16:34 -04:00
guerler cfb1b7307d Fix login page app options 2017-05-09 00:14:59 -04:00
guerler cdee899a9d Use local selector 2017-05-08 23:55:07 -04:00
guerler c8c5f3d0d5 Resolve naming conflict between config and options 2017-05-08 23:50:48 -04:00
guerler d90c75b185 Reduce global usage in router 2017-05-08 23:44:30 -04:00
guerler 8b572a8763 Remove unused panel import 2017-05-08 16:26:34 -04:00