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
21,369 Commits 69 Branches 243 Tags
dfceb5c144de556e10659a8d876237188bd4595f
Commit Graph
3020 Commits
Author SHA1 Message Date
Dannon Baker ab5f153617 Clientside routing for tour kickoff, swapping from ?tour_id=foo approach. 2016-02-04 10:23:18 -05:00
Dannon Baker 33ebeb801d Use backbone routing for a tours URL, since there's no serverside endpoint. 2016-02-04 10:21:49 -05:00
Dannon Baker 61f168d34b A slightly different check for Galaxy object definition that doesn't assume a window-attached Galaxy context, only a parent. Minor cleanup. 2016-02-04 10:19:26 -05:00
John Chilton d93f095c7f Merge remote-tracking branch 'jmchilton/param_argument_fix' 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
 2016-02-03 14:52:36 +00:00
Nate Coraor 246870c459 Merge branch 'release_16.01' into dev 2016-02-03 13:11:07 -05:00
John Chilton d7dd9f9040 Rebuild client stuff for #1650. 2016-02-03 14:37:27 +00:00
Bjoern Gruening 45f523f922 fix show_welcome_with_login = True 2016-02-03 15:19:09 +01:00
Nicola Soranzo a8be2222eb Merge branch 'release_16.01' into dev 
Conflicts:
	static/scripts/bundled/analysis.bundled.js
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js.map
	static/style/blue/base.css
 2016-02-02 19:42:42 +00:00
Daniel Blankenberg dacb91907a Merge pull request #1562 from martenson/datalibs_better_foldermanagement 
datalibs: introduce folder management; fix various glitches; refactor
 2016-02-01 11:37:43 -05:00
guerler 61818948a1 Fix default option for repeats 2016-02-01 11:31:50 -05:00
guerler 399e0ced6d Disable individual file metadata changes in upload 2016-01-29 22:51:21 -05:00
Dannon Baker f8e6a55ab7 Swap to standard url parsing function from our js utils. 2016-01-29 14:43:35 -05:00
Dannon Baker bf5bf73e82 Tour cleanup, remove a few globals. 2016-01-29 13:51:31 -05:00
Martin Cech 11c5259f46 fix librarydataset model detection; 
always show dataset.message and folder.description
 2016-01-29 10:17:48 -05:00
Martin Cech 2eb6868955 datalibs: introduce folder management; fix various glitches; refactor 2016-01-29 10:17:42 -05:00
John Chilton 807586ace8 Merge release_16.01 into dev. 2016-01-26 09:06:52 +00:00
carlfeberhard 017b97b7dc (repack bundles) 2016-01-21 16:20:10 -05:00
carlfeberhard 4a61a4cb47 UI, Histories: use links for file inputs shown in show_params (the 'i' button in the datasets of histories) that, when clicked, 1) scroll the history to the dataset shown and 2) open *that* datasets info/show_params in the center panel 2016-01-21 16:18:28 -05:00
carlfeberhard f5fbe1c502 Client: remove older compiled backbone/backbone.js, update scatterplot and charts for same; Visualizations: fix visualization-model url; Scatterplot: fix title bug and Galaxy var 2016-01-21 13:38:12 -05:00
John Chilton a00faba4fe Merge pull request #1551 from guerler/fix_hidden_rerun_000 
[16.01] Keep track of hidden datasets
 2016-01-21 09:39:02 -05:00
guerler 035a67d0b5 Keep track of hidden datasets 2016-01-21 03:15:23 -05:00
guerler bbff72e0ce Fix upgrade messages 2016-01-20 19:48:02 -05:00
Martin Cech bb15242903 repack static scripts 2016-01-20 15:20:17 -05:00
carlfeberhard 7dba828632 UI, Tool form: replace spinner gif with font awesome icon 2016-01-19 16:27:47 -05:00
carlfeberhard bf459c8d55 UI: (cleaning up) remove handlebars compiled/map and remaining references 2016-01-19 14:12:28 -05:00
carlfeberhard 250ad37737 UI, Tools: remove handlebars templates 2016-01-19 12:41:21 -05:00
carlfeberhard cf1bcaa0a6 UI, Tools: convert handlebars templates for tool panel to underscore tempaltes 2016-01-19 12:36:21 -05:00
carlfeberhard 9f8cc9a13f Client-build: add the webpack task file, merge dev 2016-01-15 14:04:10 -05:00
carlfeberhard 313c6a7247 Client-build, Webpack: add tasks to grunt for the common webpack tasks, update readme 2016-01-15 13:51:24 -05:00
carlfeberhard d5d39ed85c (merge dev) 2016-01-15 11:27:23 -05:00
guerler 03082a7239 Fix test label 2016-01-14 18:52:08 -05:00
guerler 907ce6efd2 Fix inputs 2016-01-14 18:27:22 -05:00
guerler 5d22fa7dd9 Fix message styles and fading 2016-01-14 18:02:55 -05:00
guerler 5d5dfb5f64 Revise ui-misc 2016-01-14 15:37:07 -05:00
guerler e52626b279 Apply fix from 16.01 2016-01-14 09:09:57 -05:00
guerler 30c472a388 Add flat id attribute to form parameters 2016-01-14 09:05:31 -05:00
guerler 0ccb72160a Refactor masthead render to improve readibility 2016-01-14 09:04:41 -05:00
guerler 94443625d8 Cleanup settings view 2016-01-14 09:02:27 -05:00
John Chilton 793fbdbedc Merge remote-tracking branch 'jmchilton/release_16.01' into dev_merge_0 
Conflicts:
	static/scripts/bundled/libs.bundled.js
	static/scripts/bundled/libs.bundled.js.map
 2016-01-14 07:44:48 +00:00
John Chilton f2c3eaaf64 Merge branch 'release_16.01' into dev_merge_0 
Conflicts:
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js
	static/scripts/bundled/libs.bundled.js.map
 2016-01-14 07:41:29 +00:00
guerler 4b5b970d78 Fix disabled css 2016-01-13 20:50:40 -05:00
guerler e14449e62d Revise label handling in form 2016-01-13 16:23:38 -05:00
guerler 37f8038d63 Undo user icon in masthead 2016-01-13 14:31:40 -05:00
guerler c4b5323035 Remove parenthesis 2016-01-12 16:35:38 -05:00
Dannon Baker 4819d1aa71 set ajaxConfig.data to null if an empty dict 2016-01-12 16:34:39 -05:00
Dannon Baker b47b5ff00a Fix for bad URL generation when empty GET string data. 2016-01-12 16:33:31 -05:00
carlfeberhard adb577e7f8 UI: use strict and replace leaky uses of Backbone.Events.on with listenTo 2016-01-12 15:18:54 -05:00
Dannon Baker 5a2eb7d473 Rebundle post merge. 2016-01-12 15:00:56 -05:00
John Chilton 3dda415fb9 Merge remote-tracking branch 'jmchilton/release_16.01' into release_16.01_merge_4 
Conflicts:
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js.map
 2016-01-11 12:15:14 +00:00
carlfeberhard 54dca064fa UI, Multi-history: fix drop event handler to use dataTransfer of original event 2016-01-11 10:21:06 -05:00