opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-16 15:45:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,200 Commits 62 Branches 243 Tags
53cfedaaeaba2bba803a4040e161539e6d6660b7
Commit Graph
28200 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
guerler 53cfedaaea Pack scripts 2017-06-06 12:51:15 -04:00
guerler 81592f3c32 Remove pages grid mako 2017-06-06 12:50:11 -04:00
guerler 26fdf8b8fd Display only link for shared pages since viewing is the only operation 2017-06-06 12:49:28 -04:00
guerler aa85d00615 Add shared pages table 2017-06-06 12:43:17 -04:00
guerler abe3b1e326 Add shared by other, load rendering through model 2017-06-06 12:07:28 -04:00
guerler 3208325b2e Properly redirect after editing a page 2017-06-05 15:26:13 -04:00
guerler 9784c1d698 Redirect create submission 2017-06-05 15:22:28 -04:00
guerler aac37045d5 Redirect masthead link to client route 2017-06-05 15:18:57 -04:00
guerler 0a03039e35 Add page list viewer, move sharing feature out of operations 2017-06-05 15:16:27 -04:00
guerler 1ce6738287 Switch pages grid controller endpoint to dictionary mode 2017-06-05 14:33:26 -04:00
John Chilton 9d1a382f86 Merge pull request #4098 from mvdbeek/download_collection 
Add possibility for downloading entire collections
 2017-06-05 08:49:32 -04:00
John Chilton 00de5b9f9a Merge remote-tracking branch 'jmchilton/dev' into download_collection 2017-06-05 08:48:42 -04:00
John Chilton 294c1d1154 Merge pull request #4120 from theosotr/fix-client-initialization 
Fix chronos client initialization
 2017-06-05 08:40:50 -04:00
Dannon Baker c269041b61 Merge remote-tracking branch 'upstream/release_17.05' into dev 2017-06-04 08:31:33 -04:00
Dannon Baker cbe9944815 Merge pull request #4147 from martenson/fix_hide_error 
[17.05] Hide error highlighting if user interacts with highlighted field
 2017-06-04 08:09:13 -04:00
guerler 9d0f9efbba Disable feature for forms which auto refresh with a server validation 2017-06-02 15:51:59 -04:00
guerler fdc712fb88 Hide error highlighting if user interacts with highlighted field 2017-06-02 15:49:41 -04:00
Martin Cech 1fc12ebf1c Merge pull request #4146 from nsoranzo/doc_fixes 
Documentation fixes and improvements
 2017-06-02 13:24:41 -04:00
Dannon Baker e8f730895c Merge remote-tracking branch 'guerler/remove_grids_mako' into dev 2017-06-02 12:54:25 -04:00
Nicola Soranzo fc9b3ad4a9 Generate api.rst and ts_api.rst during make 2017-06-02 16:47:30 +01:00
Nicola Soranzo 71df810ddb Document <hook> sub-element of <code> 
This is deprecated and used only by:
- https://toolshed.g2.bx.psu.edu/view/devteam/cluster/
- https://toolshed.g2.bx.psu.edu/view/devteam/merge/

Fix https://github.com/galaxyproject/galaxy/issues/3516 .
 2017-06-02 15:09:44 +01:00
Nicola Soranzo 92952882d2 Fix some links and syntax errors in tool XML doc 2017-06-02 15:09:44 +01:00
Nicola Soranzo 5ab560068d Update lib documentation 
Also simplify updaterst target in doc/Makefile

Partially revert commit b4feb85f11 : re-add
doc/source/lib/galaxy.webapps.galaxy.api.rst and
doc/source/lib/galaxy.webapps.tool_shed.api.rst and include them in
doc/source/api/api.rst and doc/source/api/ts_api.rst respectively to
simplify doc maintenance.
 2017-06-02 15:09:44 +01:00
Nicola Soranzo d807ed0f75 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
	static/scripts/bundled/login.bundled.js.map
 2017-06-02 15:05:14 +01:00
Aysam Guerler 0272e188a8 Merge pull request #4139 from dannon/tag_sorting 
[17.05] Tag fixes
 2017-06-02 02:05:44 -04:00
Dannon Baker 20d2303d34 Merge remote-tracking branch 'upstream/release_17.05' into dev 2017-06-01 13:39:36 -04:00
Dannon Baker b0c46cc4d0 Merge pull request #4140 from blankenberg/17.05_data_tables_URL_fix 
[17.05] Fix for Data Tables loaded from a URL.
 2017-06-01 13:36:28 -04:00
Dannon Baker c1d822d96d Merge pull request #4141 from erasche/wiki-links 
Swap over all URLs to new wiki location
 2017-06-01 13:26:42 -04:00
E Rasche 2f992d90ae Rebase 2017-06-01 16:43:21 +00:00
Daniel Blankenberg c2348340cf Fix for Data Tables loaded from a URL. 2017-06-01 12:36:37 -04:00
Dannon Baker e43ef79576 Merge pull request #4077 from martenson/improve-release-process 
Improve release checklist
 2017-06-01 11:46:15 -04:00
Dannon Baker 0954290e5d Combine list comprehensions, slightly tweak logic. 2017-06-01 10:38:18 -04:00
Dannon Baker 12905321ca Allow hashtag usage in workflow PJA tag addition mechanism 2017-06-01 10:38:18 -04:00
Dannon Baker 0c43954e8d Slight tweak of logic in tag filtering PJA 2017-06-01 10:38:18 -04:00
Dannon Baker 967c363786 Filter tags for empties (fixes #4127) 2017-06-01 10:38:18 -04:00
Dannon Baker c260e0b0c8 Sort tags for display (note, this is stupid to have in 3 places -- refactor) 2017-06-01 10:38:13 -04:00
Martin Cech 8b7b5b6c8e Merge pull request #4138 from dannon/workflow_display_styling 
Improved styling of workflow list.
 2017-06-01 10:31:47 -04:00
Dannon Baker f3aa53261d Improved styling of workflow list. Removed unused class, used hierarchy in base.less. 2017-06-01 09:48:44 -04:00
Thodoris Sotiropoulos f2f1fba10e chronos-runner: Mention about insecure option at job_conf 2017-06-01 10:41:02 +03:00
Dannon Baker 75028ac1ee Merge pull request #4133 from guerler/escape_regex 
[17.05] Properly escape potential regex expression in workflow parameters
 2017-05-31 19:20:44 -04:00
Martin Cech f6ced00ef0 Merge pull request #4135 from blankenberg/17.05_zipfile 
[17.05] Fix for returning a fileobject in compression_utils.py when handling a zipfile.
 2017-05-31 18:48:01 -04:00
Daniel Blankenberg a9d0d3671a Fix for returning a fileobject in compression_utils.py when handling a zipfile. 
Will return the first named object in the archive. zipfile.os_zipfile does not exist...
 2017-05-31 16:55:32 -04:00
guerler c409572ef8 Handle potential regex expression in workflow parameter names 2017-05-31 16:28:18 -04:00
Dannon Baker b6597d43f3 Merge remote-tracking branch 'upstream/release_17.05' into dev 2017-05-31 15:06:35 -04:00
Nicola Soranzo 5845af2562 Merge pull request #4126 from manabuishii/patch-5 
Fix typo
 2017-05-31 08:12:05 +01:00
Manabu ISHII 7037a57a42 Fix typo 2017-05-31 13:45:25 +09:00
guerler b764d35cf7 Merge branch 'dev' into remove_grids_mako 2017-05-30 20:09:38 -04:00
Aysam Guerler d61ab1644b Merge pull request #4124 from dannon/fix_workflow_menu_escaping 
New workflow menu message fix
 2017-05-30 15:06:19 -04:00
Dannon Baker 5c954139fa Since we're using addClass to inject status type, it's not necessary to escape this one. 2017-05-30 14:27:06 -04:00
Dannon Baker 8080c08ae6 Fix escaping of status/message passed by querystring in the new workflow 
menu.
 2017-05-30 14:24:59 -04:00