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
26,108 Commits 69 Branches 243 Tags
58a3a5b71b00c974b19eae514b09abfc04b74170
Commit Graph
3699 Commits
Author SHA1 Message Date
Nicola Soranzo ed4e87ecad Merge branch 'release_16.10' 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
	static/style/blue/base.css
 2016-12-15 11:27:28 +00:00
Bjoern Gruening d2ab7e701c build the client 2016-12-14 22:46:36 +01:00
Dannon Baker 3ab4e1d742 The jobs API, which this functionality is based on, requires a logged in user, so prevent anonymous access here. Also shifts to using Galaxy.root correctly, instead of assuming / 2016-12-14 15:59:18 -05:00
Nicola Soranzo 06de9d0ae0 Merge branch 'release_16.10' into dev 
Conflicts:
	static/scripts/bundled/libs.bundled.js
	static/scripts/bundled/libs.bundled.js.map
 2016-12-09 17:13:07 +00:00
Nicola Soranzo d6d2a12ec0 Merge branch 'release_16.07' into release_16.10 
Conflicts:
	client/galaxy/scripts/mvc/upload/composite/composite-row.js
	client/galaxy/scripts/mvc/upload/default/default-row.js
	static/maps/mvc/upload/composite/composite-row.js.map
	static/maps/mvc/upload/default/default-row.js.map
	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
	static/scripts/mvc/upload/composite/composite-row.js
	static/scripts/mvc/upload/default/default-row.js
 2016-12-09 17:09:28 +00:00
Dannon Baker c315f1d74b Upload file escaping backport. 2016-12-08 15:31:59 -05:00
Dannon Baker 9c435685cd Don't rely on complex, absolute selector, use local element.find() 2016-12-07 16:31:02 -05:00
Nicola Soranzo cbd527b9a4 Merge branch 'release_16.10' into dev 
Conflicts:
	static/scripts/bundled/analysis.bundled.js
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js.map
 2016-12-07 20:35:40 +00:00
Dannon Baker 13ab07030c Use consistent spacing. 2016-12-07 07:53:34 -05:00
Dannon Baker 8766e12509 Escape filename in upload dialog, default and composite. Pointed out by David Wyde. 2016-12-07 07:48:34 -05:00
Martin Cech bf8cffa2b3 repack client 2016-11-30 12:10:23 -05:00
Martin Cech 710c2639f9 Merge branch 'dev' into adjust-menu-tooltips 
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-11-30 12:08:46 -05:00
Nicola Soranzo 2d510fae98 Merge branch 'release_16.10' into dev 
Conflicts:
	static/maps/mvc/form/form-section.js.map
	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
	static/scripts/mvc/form/form-section.js
 2016-11-30 15:31:26 +00:00
guerler e6c1e8e4e8 Rename label for history permissions 2016-11-29 21:13:32 -05:00
guerler e0a4171113 Attempt to rephrase user preference description for history permissions 2016-11-29 21:07:02 -05:00
guerler e4222b9ae6 Drop default tooltip 2016-11-29 19:21:42 -05:00
Dannon Baker be6a2f8132 Merge remote-tracking branch 'upstream/release_16.10' into fix_help_history 2016-11-29 17:00:20 -05:00
Martin Cech 72960de216 adjust menu tooltips to be oneliners 2016-11-29 15:51:45 -05:00
Dannon Baker 83e1392cf8 Standard styles inclusion in .less, more styling to match rounded edges and spacing. 2016-11-29 10:02:27 -05:00
Dannon Baker 29cf718723 Minor styling tweaks -- todo: swap from inline to class-based. 2016-11-28 14:59:41 -05:00
Dannon Baker ce320b66ea A bit of refactoring, handling of unavailable tools or tools with no help. Slight style changes. 2016-11-28 13:32:00 -05:00
guerler 6e1b26115e Hide communication server form if disabled 2016-11-23 14:36:24 -05:00
guerler 416b94f195 Avoid using navigate, reload page until routing has been established 2016-11-23 14:24:38 -05:00
guerler 16a60538d9 Fix history back, and forward 2016-11-23 13:55:03 -05:00
guerler 20d45ee62c Temporary routing, not best practice 2016-11-23 13:47:08 -05:00
guerler b38c6afefe Merge branch 'dev' into remove_mako_user_pref 2016-11-23 12:06:50 -05:00
guerler 98c5a59a18 Merge branch 'dev' into remove_mako_user_pref 2016-11-23 11:51:25 -05:00
Dannon Baker 6aab802e5a Tour routing tweaks, allows us to drop the model out of menu 2016-11-23 11:02:42 -05:00
guerler d4760ed210 Enable new user preference ui by default 2016-11-22 20:27:00 -05:00
guerler bb33e8959f Align spacing, code style alignment 2016-11-22 20:24:37 -05:00
guerler f960be7b43 Route user preferences analogous to tours 2016-11-22 20:22:14 -05:00
guerler 2108043ded Use current user icon for now, new user icon will be available in fa 4.7 2016-11-22 18:50:01 -05:00
guerler 2366eda8f3 Use person icon for user information and chat bubbles for communication settings 2016-11-22 18:44:59 -05:00
guerler 5fe064d4c8 Mention history in permissions link 2016-11-22 18:42:08 -05:00
guerler cfe0305f39 Fix missing user tool filter handling 2016-11-22 17:55:16 -05:00
guerler a4ae3c953b Only show communication settings if communication host has been specified 2016-11-22 17:33:09 -05:00
guerler 564a7236ca Remove api keys from user dropdown 2016-11-22 17:28:44 -05:00
guerler daa1900929 Fix link to user preferences when library view is shown 2016-11-22 17:27:19 -05:00
guerler a9dab631fb Preserve custom event handler for form inputs 2016-11-22 14:24:54 -05:00
Daniel Blankenberg 74d8faac9f Change 'History Actions' to 'Current History' in history options menu. 
as it was before 1cc57b1eb2.
 2016-11-21 14:37:54 -05:00
Daniel Blankenberg 5ba8201163 Pack scripts 2016-11-21 11:02:20 -05:00
Martin Cech 5c4ac18b44 remove unused override 
this caused Help/Search to point at /root/tool_search
 2016-11-18 11:05:28 -05:00
guerler 51972a9916 Use inputs tag to indicate that the response is consistently for input handling 2016-11-17 17:25:05 -05:00
guerler 364f57d06d Merge branch 'dev' into remove_mako_user_pref 2016-11-17 17:13:43 -05:00
guerler d52f4fd523 Use separate endpoints instead of identifying the request type 2016-11-17 17:11:01 -05:00
guerler 9914130fb4 Remove logout endpoint from api, redirect to controller endpoint instead 2016-11-17 15:40:45 -05:00
Dannon Baker 5028e2a251 Merge remote-tracking branch 'upstream/dev' into workflow_intermediates_ux 2016-11-16 14:23:07 -05:00
Dannon Baker f8974acba2 Fix styling when only one visualization type exists 2016-11-15 14:03:46 -05:00
Dannon Baker db63b131c1 Fix styling, we don't need to force rounded edges here. 2016-11-15 13:29:07 -05:00
Dannon Baker 3f4033c05d Merge remote-tracking branch 'tmcgowan/issue_2100' into dev 2016-11-15 09:54:06 -05:00