Commit Graph
190 Commits
Author SHA1 Message Date
Dannon Baker 546a8c6df9 Remove unnecessary (not sure what the intent was here) assignment in return. 2017-10-24 11:55:10 -04:00
Dannon Baker 56855b6f94 Merge upstream/dev. 2017-10-09 15:42:21 -04:00
Dannon Baker e671138e93 Fix trackster scoping issues causing a failed load. 2017-10-06 12:11:01 -04:00
guerler 728087ed53 Merge remote-tracking branch 'jmchilton/multiple_files_per_upload' into ftp_uploader 2017-10-03 10:40:52 -04:00
Dannon Baker d1daca61b9 Merge remote-tracking branch 'upstream/dev' into es6 2017-09-19 10:03:55 -04:00
Dannon Baker ecb4e06799 We apparently always use '|' in the title, even though masthead uses '/'. It does look better. 2017-09-11 12:54:15 -04:00
Dannon Baker 2c40efb6c2 Minor refactor, use a single Utils.setWindowTitle() method. 2017-09-11 10:32:55 -04:00
E Rasche 569bd6bedf Show a more useful error when one is available 2017-09-07 16:31:21 +02:00
guerler 2ecd18e769 Index ftp files instead of using backbones filtering function 2017-08-29 20:26:16 -04:00
Dannon Baker c6d7ed1068 Merge latest upstream/dev 2017-08-23 12:39:59 -04:00
Dannon Baker 03eb852c2d gulp-uglify major version bump and rebuild 2017-08-16 11:02:27 -04:00
Max Schaefer 57c6284269 Run make client. 2017-08-16 15:27:26 +01:00
Dannon Baker 0d2beb2850 Merge remote-tracking branch 'upstream/dev' into es6 2017-08-15 14:32:05 -04:00
guerler 733e225ec9 Fix message handling in user preference main view 2017-08-07 22:22:03 -04:00
guerler cd8314808e Allow array parsing through url 2017-08-03 22:51:13 -04:00
Dannon Baker 6940a3b72b Merge remote-tracking branch 'upstream/dev' into es6 2017-08-01 10:45:03 -04:00
anuprulez e9b132bd53 Merging with dev 2017-06-21 17:26:48 +02:00
anuprulez 6704872cd9 Moving the creation of script and style tags to Utils 2017-06-21 17:18:46 +02:00
anuprulez 785e3e557a Fixing PR review comments 2017-06-09 14:35:57 +02:00
Dannon Baker 07502bbfbc Babel transpiling for all gulped files. 2017-04-06 15:07:59 -04:00
Dannon Baker aae2cd352f Minimal gulp task to run uglify, babel, sourcemaps. The new 'clean'
approach also removed some cruft we had sitting in the static/scripts
folder and were unintentionally shipping.
2017-04-06 09:34:42 -04:00
guerler 46d05ba080 Merge branch 'dev' into remote_chart_plugins 2016-09-29 22:49:23 -04:00
guerler 2cf7b8ee15 Fix status handling for ajax requests 2016-09-23 06:36:04 -04:00
guerler 71fe20ab04 Identify links in visualizations plugins descriptions 2016-08-30 21:04:32 -04:00
guerler 972c5c0ce0 Revise cloning method 2016-08-19 08:25:28 -04:00
guerler b23b18c302 Populate input states for settings and group forms 2016-08-19 08:25:25 -04:00
carlfeberhard 5ff73677bb (merge conflicts) 2016-05-31 11:16:20 -04:00
guerler 2ddf4e02fc Upgrade shared ui libraries, add test cases 2016-05-18 08:24:35 -04:00
carlfeberhard f8e89ff3fc (merge conflicts) 2016-05-12 13:39:38 -04:00
guerler 7e63ae66cd Update qunit and sinon 2016-05-10 20:40:39 -04:00
carlfeberhard 3686ed55c3 UI, history: use arrays when filtering contents
- Moves all history filtering to returning arrays and not new
HistoryContents (subset collections)
- Reworks contents.ajaxQueue
- Moves filterAndUpdate to contents from HistoryView
2016-05-02 10:33:54 -04:00
guerler 7718ac511b Rename Utils.validate() to Utils.isEmpty() 2016-04-25 15:30:43 -04:00
Dannon Baker bbf5722f27 Merge branch 'release_16.04' into dev 2016-04-22 12:33:14 -04:00
guerler e5b3c94c5e Fix js value validator 2016-04-22 12:16:19 -04:00
Dannon Baker 9cd168bbab make client 2016-04-21 09:27:10 -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
guerler 7ea4668ff7 Remove former populate_state 2016-02-18 17:41:38 -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
guerler 048561d282 Avoid duplicate upload entries, revise modals, add tests
Revise styles

Add more tests
2015-12-19 17:08:49 -05:00
Dannon Baker cf5d209e0f Manual merge of #1303 to resolve build artifact conflicts. 2015-12-16 06:51:12 -05:00
carlfeberhard 9e512f5246 UI, History: use copy dialog in the embedded histories in Pages, add autoClose option to copy dialog 2015-12-11 08:44:45 -05:00
carlfeberhard d72b913c1d UI, History: hack multiple copy by API into the 'histories shared with me' mako grid 2015-12-10 16:25:52 -05:00
guerler ab651fa89c Fix url, lint and packing
Catch missing history, fix failing api test
2015-12-06 10:48:40 -05:00
guerler 4dc134d43b Merge branch 'dev' of git://github.com/galaxyproject/galaxy into run_workflow_form_004 2015-12-05 18:29:18 -05:00
carlfeberhard 9c5d4cfc0e (merge dev) 2015-11-20 10:29:23 -05:00
guerler 458766b00f Add run workflow tool form
Move styles to css

Improve handling of numeric workflow parameters
2015-11-20 09:26:58 -05:00
carlfeberhard d1d2f8388a Webpack: allow extending options from template call, add /login as app entry point for login app (still allowing user/login), add root/welcome and /login to allowed paths when require_login, fix None type error for redirect when visiting user/login directly, fix rendering of masthead, add query string to object util, correct job_id loading from index 2015-11-18 15:11:30 -05:00