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
23,109 Commits 69 Branches 243 Tags
9e596cdf5fbd4e63f7811d7d82929ee2d03fc79b
Commit Graph
161 Commits
Author SHA1 Message Date
guerler 2ddf4e02fc Upgrade shared ui libraries, add test cases 2016-05-18 08:24:35 -04:00
guerler 7e63ae66cd Update qunit and sinon 2016-05-10 20:40:39 -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
carlfeberhard 7b93a53a4c Webpack: polyfill object.assign for phantomjs; remove galaxy.frame.masthead.css in favor of adding styles locally; change css load order to prevent 'ui-button' name collision between base and jquery-ui 2015-11-17 12:16:13 -05:00
guerler 0a09de5453 Show welcome page with required login, remove iframes 
Reinsert iframe for login

Use iframes
 2015-11-16 14:47:59 -05:00
carlfeberhard 2956b12e9b Webpack: correct tool menu template loading in requirejs/galaxy.panels.mako by using require.config.map; normalize galaxy_config.root and Galaxy.options.root to Galaxy.root across the templates and js 2015-11-13 18:05:26 -05:00
carlfeberhard c3f4b54b68 Webpack, localization: support both requirejs and webpack i18n by including the amdi18n-loader (both now share the utils/localization file) 2015-11-13 15:56:29 -05:00
carlfeberhard a4edf159be (merge dev) 2015-11-12 10:04:38 -05:00
guerler 76bcfaa0ff Fix log comments 
Use emit

Fix namespace

Fix namespace

Remove empty line

Check if logger exists

Fix comment

Redo

More

Fix yet another log

Fix statements

More fixes

Move emitter
 2015-11-07 00:45:00 -05:00
carlfeberhard e59d08f856 Webpack: move vendor to libs; break up galaxy.panels to panels and modal; break up galaxy.base to polyfills, galaxy-async, ui/popupmenu, ui/editable-text, and utils/async-save-text; move reset_tool_search into workflow-view; move commatize into trackster/util; move galaxy.autocom_tagging to ui/autocom_tagging 2015-11-06 17:10:52 -05:00
carlfeberhard 84b40650ec (merge dev) 2015-11-03 15:12:31 -05:00
Dannon Baker 593cb4074b Merge pull request #1018 from guerler/revise_promise_000 
Revise deferred queue, use jQuery promises
 2015-11-03 13:32:00 -05:00
guerler 2e21e027b0 Insert promises 
Revision

Revise deferred class to use promises

Update charts

Fix comment

Use resolve and reject properly

Fix comments

Fix comments

Fix comments

Fix comment

Improve naming/comments

Remove unnecessary queue handler

Fix naming
 2015-11-02 12:59:16 -05:00
carlfeberhard b67601f74c Client logging: move logger assignment into Galaxy object, both Galaxy.user and all LoggableMixins will now respond to debugging, properly localize error messages 2015-10-30 15:58:08 -04:00
carlfeberhard b75150ade7 Client logging: remove 'namespaced', allow 'log' to be added in the standard way (now that browsers are compat with this), simplify interface in the Galaxy object 2015-10-30 10:43:11 -04:00
carlfeberhard d96fc60e1f Client logging: allow focusing on one or more namespaces, add function to more easily namespace loggers 2015-10-29 13:09:28 -04:00
carlfeberhard a9ac9193c1 Client logging: adapt metrics logger for optional debug logging 2015-10-29 12:27:17 -04:00
guerler c70c1aabd8 Fix deferred dom removal 
Remove empty line

Fix comments

Fix log location

Fix comments
 2015-10-27 15:37:39 -04:00
carlfeberhard 0235eceb57 (merge dev) 2015-10-23 12:17:32 -04:00
Carl Eberhard b1841e22d9 Client build: do not drop console when compressing, when not compressing do not mangle variable names 2015-09-01 10:55:41 -04:00
Martin Cech f9f763f430 add missing js build 2015-08-25 16:35:31 -04:00
guerler ed171e9519 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into upload_000 
Conflicts:
	static/maps/utils/utils.js.map
	static/scripts/utils/utils.js
	static/style/blue/base.css
 2015-08-17 11:36:49 -04:00
guerler 0c3fdd2d63 Add test cases for uploader, add generic Galaxy environment to qunit 2015-08-17 11:33:03 -04:00
Dannon Baker 63d6c37a39 Rebuild client w/ new options. 2015-08-13 15:23:55 -04:00
guerler c7ad46099c Enable ftp file selection for composite uploads 2015-08-11 11:55:17 -04:00
guerler eaff25b6eb Merge branch 'dev' of https://github.com/galaxyproject/galaxy into upload_000 
Conflicts:
	client/galaxy/scripts/mvc/upload/upload-view.js
	static/maps/mvc/upload/upload-view.js.map
	static/scripts/mvc/upload/upload-view.js
	static/style/blue/base.css
 2015-08-10 11:26:37 -04:00
John Chilton 668e650f52 Merge pull request #526 from carlfeberhard/trackster.existing-browser 
Visualizations, trackster: allow the user to add the dataset launched…
 2015-08-05 20:50:18 +01:00
guerler 8eca23e4b4 Attach success, error handlers for composite uploads, fixes 2015-08-05 05:43:29 -04:00
guerler 8e093847f9 Enable composite data submission 2015-08-05 04:41:18 -04:00
guerler 42c61535d6 Separate upload post function, remove some unnecessary functions 2015-08-05 01:49:10 -04:00
guerler cc46b65d16 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into upload_000 
Conflicts:
	static/style/blue/base.css
 2015-08-05 01:05:35 -04:00
guerler 1338904288 Separate file submission from upload queue, augment and generalize send function 2015-08-05 01:03:40 -04:00