opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-24 12:13:33 +08:00
Code Issues Packages Projects Releases Wiki Activity
22,519 Commits 63 Branches 243 Tags
642fccd288415b36c2e8a1a725191e4480e2d6d9
Commit Graph
1301 Commits
Author SHA1 Message Date
Martin Cech 642fccd288 do not pass variable that is not used 2016-04-18 15:27:36 -04:00
Martin Cech 35ab333c7e remove old template 2016-04-18 15:18:50 -04:00
Martin Cech 980d37f50f fix a bug with missing history_id in libraries dataset import 
also allow creation of new histories as exists in the folderlist view
 2016-04-18 15:14:06 -04:00
guerler cea9a12238 Replace masthead dom to avoid duplication 2016-04-18 09:49:02 -04:00
Dannon Baker 1c38b9723c Merge 16.01->16.04 2016-04-15 11:39:07 -04:00
Dannon Baker 3e79a574be Merge #2167 manually to resolve conflicts. 2016-04-15 11:31:58 -04:00
carlfeberhard 8b49814859 Merge 16.01 into 16.04 2016-04-14 14:49:07 -04:00
carlfeberhard e26bff23ed Merge 'release_15.10' with 'release_16.01' 2016-04-14 12:59:05 -04:00
carlfeberhard 03c8573731 Multi-history: open rerun button in new tab 2016-04-14 12:12:23 -04:00
Martin Cech 87dbfeeabd Merge branch 'release_16.01' into release_16.04 
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
 2016-04-13 11:55:16 -04:00
Martin Cech 1e3b3a1558 fix the value passed to Masthead as options were options.config before 2016-04-12 14:43:18 -04:00
Martin Cech 2ebe940510 load options from config, not from options 2016-04-12 12:50:18 -04:00
guerler 543a999dfa Fix data type list in editor 2016-04-07 04:44:11 -04:00
John Chilton aee38feeb4 Merge remote-tracking branch 'galaxyproject/dev' into gie-generic 
Conflicts:
	static/maps/layout/menu.js.map
	static/scripts/bundled/libs.bundled.js
	static/scripts/bundled/libs.bundled.js.map
	static/scripts/layout/menu.js
 2016-04-04 13:00:21 -04:00
Dannon Baker 565f11f142 Merge branch 'lib-refactor-cleanup' into dev 2016-03-30 09:43:19 -04:00
Dannon Baker d15b1030c5 Merge, rebuild. 2016-03-29 16:03:18 -04:00
Martin Cech 971b987f0b libraries: fetch nondeleted only first to speed up 
fetch the deleted only when specifically requested
 2016-03-29 12:38:21 -04:00
Martin Cech 5def7ee035 refactor rest of JS templates; 
move all text outside of the fontawesome spans
convert console. calls to Galaxy.emit calls
 2016-03-29 12:38:21 -04:00
guerler 9f0ddf57bb Revise input wrapper, add test cases 2016-03-29 12:02:10 -04:00
Martin Cech ee0a65bf13 fix duplication of select2 entries 
leverage caching
 2016-03-28 11:08:23 -04:00
guerler d0f7ce260d Add workflow content selectors and test cases 2016-03-27 16:18:29 -04:00
guerler f70df22060 Upgrade content selector, add test cases 2016-03-27 16:18:26 -04:00
Dannon Baker 3240c20a4b Swap analyse to analyze to be consistent. 2016-03-25 17:12:24 -04:00
Martin Cech ce1b9aeb38 minor adjustments to markup; improve logging; repack 2016-03-25 15:54:26 -04:00
Martin Cech 87ea37ca28 add 'create history &import to it' feature 
various refactorings and fixes to UX glitches
 2016-03-25 15:24:23 -04:00
John Chilton 6aaec509ed Merge pull request #2000 from martenson/fix-lib-icons 
libraries: change default size of fa in iconspans
 2016-03-25 10:52:50 -04:00
Dannon Baker 7d1b525682 The response from dataproviders here can return data===null in addition to being simply undefined. This corrects the logic shortcutting and prevents errors like 'Cannot read property 'min' of null' 2016-03-25 10:37:28 -04:00
Martin Cech ab31bd9f48 move text out of icon spans for library dataset view 
also re-touch the html to be better readable
 2016-03-24 13:12:02 -04:00
Martin Cech e1fcbc7a20 change default size of fa in iconspans 
leave as is for the globe icon
 2016-03-23 16:58:22 -04:00
Martin Cech 93b7473be8 remove deprecated user-facing lib link; 
remove 'published' from the menu items for shared elements
 2016-03-23 15:20:06 -04:00
Dannon Baker 033241c99f Merge 16.01, rebuild. 2016-03-23 12:39:06 -04:00
Nicola Soranzo d10ee6f6c4 Merge branch 'release_16.01' into dev 
Conflicts:
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js
	static/scripts/bundled/libs.bundled.js.map
 2016-03-22 20:54:32 +00:00
guerler 79d16f71f9 Fix scratchbook 2016-03-22 14:19:58 -04:00
carlfeberhard fef166545c Layout: Fix optional panel rendering and associated inline css 2016-03-22 11:52:13 -04:00
Dannon Baker 4bf8adbb64 Merge, rebuild. 2016-03-22 11:24:58 -04:00
carlfeberhard 133f77413e Fix 'Resend verification' link in inactive user message box which would display as [Object object] 2016-03-22 11:24:14 -04:00
guerler 58346169df Fix dom duplication 2016-03-22 10:54:38 -04:00
John Chilton 35403f2a91 Merge pull request #1970 from martenson/select-all-from-history 
libraries: provide select all/none options when importing
 2016-03-22 09:05:31 -04:00
Dannon Baker 35e75d11ce Merge branch 'release_16.01' into dev. 
Rebuild client.
 2016-03-21 19:33:05 -04:00
Martin Cech 4b1b15aee8 libraries: provide select all/none options when importing 
improve UX by using autofocus in modals
fix a bug with selecting all folder items and deleting
 2016-03-21 17:26:01 -04:00
Daniel Blankenberg e4e92e55ab Fix typo: send-->sent 2016-03-21 14:18:56 -04:00
Martin Cech 50e5b08d7c libraries: also show folder items paginator at the bottom of the items 2016-03-21 12:09:14 -04:00
guerler bd0439d9b7 Fix tool access rights and forwarding 2016-03-18 20:12:21 -04:00
Eric Rasche 1c94fdd528 Merge in master 2016-03-17 13:48:58 +00:00
Eric Rasche 755465cf94 Merge in master 2016-03-17 13:47:10 +00:00
Eric Rasche 50770c962a Repack client 2016-03-17 13:45:41 +00:00
guerler 4976945ab0 Fix icon sizes 2016-03-15 17:21:21 -04:00
carlfeberhard d9fc71510a (merge conflicts) 2016-03-08 12:39:24 -05:00
John Chilton 36d85e81ee Merge pull request #1843 from dannon/click_workflow_overview 
Workflow editor overview click navigation
 2016-03-08 09:04:27 -05:00
Dannon Baker 4cf9064358 Merge, rebuild client. 2016-03-07 17:55:04 -05:00