Commit Graph
4677 Commits
Author SHA1 Message Date
Dannon Baker 3259ecb789 Fix two invalid targets in dataset list item (top vs _top -- caused new window instead of nav; eventually this'll just be router when everything is compatible) 2017-10-18 11:50:48 -04:00
Dannon Baker 5b2928f851 Adjust prettier glob, rerun/rebuild. 2017-10-17 13:10:59 -04:00
Dannon Baker 87873c5e2f Make it prettier, rebuild 2017-10-17 12:58:15 -04:00
Dannon Baker 5e3187405a Bundle toastr in common libs 2017-10-13 12:45:17 -04:00
Dannon Baker 1486ee3730 Merge remote-tracking branch 'upstream/dev' into es6 2017-10-12 15:57:35 -04:00
Dannon Baker 7ceaec4a22 Merge remote-tracking branch 'upstream/release_17.09' into dev 2017-10-12 12:43:05 -04:00
Dannon Baker 66b89f83ad Merge remote-tracking branch 'upstream/dev' into es6 2017-10-12 11:14:17 -04:00
Dannon Baker c4c15e323c Upgrade sinon to the latest (still legacy) version, fix jquery animation tests handling. 2017-10-12 11:09:04 -04:00
John Chilton 90f9a50574 Merge remote-tracking branch 'jmchilton/dev' into revise_dataset_attributes 2017-10-12 09:43:59 -04:00
guerler 32e10a2e30 Use ? and auto as defaults 2017-10-11 23:00:50 -04:00
guerler 82f671d3ee Use initial dbkey and file_type to specify defaults 2017-10-11 22:54:48 -04:00
Dannon Baker 9678ebcc86 De-bowerify complexify; use the same location/naming schema for where jquery.complexify is stored. Update libs bundle. 2017-10-11 19:04:38 -04:00
Dannon Baker d942782989 Debowerify jquery.cookie 2017-10-11 18:24:25 -04:00
Dannon Baker fe6da5162b De-bowerify jquery-mousewheel. 2017-10-11 15:31:45 -04:00
John Chilton 4a2aa7cab5 Always send dbkey during upload.
Seems to be needed on test.galaxyproject.org and for Selenium tests but not just running on my local laptop. This does seem to fix the problems though:

A passing selenium suite with this change: https://jenkins.galaxyproject.org/view/All/job/jmchilton-selenium/172/.
2017-10-11 14:58:04 -04:00
Dannon Baker 503bdd15a6 Jquery incremental major version bump (to 2.x) 2017-10-11 14:45:46 -04:00
Dannon Baker 5cce6d2c26 Merge remote-tracking branch 'upstream/dev' into es6 2017-10-11 14:34:25 -04:00
Dannon Baker c55861151e Start segmenting dependencies/devDependencies. 2017-10-11 14:28:31 -04:00
guerler 9a4c76da76 Fix names, removes space from icon cls 2017-10-11 01:38:57 -04:00
guerler 71a3158421 Merge branch 'dev' into revise_dataset_attributes 2017-10-11 01:22:41 -04:00
guerler 347d7805fe Fix former edit links and targets
Fix flag handling for permissions

Repack
2017-10-11 01:14:36 -04:00
guerler 7435c464b0 Add flag to specify editable forms
Parse converter exception to client
2017-10-11 00:37:50 -04:00
guerler 591873a132 Add readonly support for select fields, remove custom readonly form 2017-10-10 15:26:54 -04:00
guerler 4b3d57579a Adjust client message handler 2017-10-10 14:18:28 -04:00
guerler 589e83e909 Restore previous appearance, use operations buttons 2017-10-10 14:08:41 -04:00
guerler 9a7150f645 Hide until data is available 2017-10-10 12:43:26 -04:00
Dannon Baker d9a810d35f Use a different approach for getting default configs. Works, and allows flexible modes down the road. 2017-10-10 12:34:16 -04:00
guerler 4b93fdf5f9 Reduce render update to forms, do not re-render tabs 2017-10-10 12:31:02 -04:00
Dannon Baker 43ca268138 Swap default mode to 'Auto' in configs 2017-10-10 10:27:26 -04:00
guerler e257d0ec8a Augment error handling 2017-10-10 02:34:06 -04:00
guerler bb33e65c61 Reuse tab view, add area for info and annotation 2017-10-10 02:17:02 -04:00
guerler adc183d067 Remove colons from some labels, parse response to message handler 2017-10-10 01:41:15 -04:00
guerler 6c321dca3f Fix status message handling, use consistent message format 2017-10-10 01:03:13 -04:00
guerler e191991242 Reconnect attributes endpoint 2017-10-10 00:46:16 -04:00
guerler 220fdccd57 Do not rely on the existence of the analysis app router 2017-10-09 17:15:24 -04:00
guerler 14c6622cac Show attribute editing without tabs 2017-10-09 17:09:41 -04:00
John Chilton 065c08dd90 Bugfix - do not initiate empty FTP uploads.
Broken with #4513.
2017-10-09 16:32:07 -04:00
guerler b451c6a137 Use consistent naming for input forms 2017-10-09 16:22:05 -04:00
guerler bd5f711bd2 Separate endpoints for form building and attribute changes 2017-10-09 16:01:54 -04:00
Dannon Baker 56855b6f94 Merge upstream/dev. 2017-10-09 15:42:21 -04:00
guerler dcad663cee Load dataset errors without page refresh 2017-10-09 14:01:25 -04:00
guerler 1c9ff98b81 Load dataset edit attributes without page refresh 2017-10-09 13:50:01 -04:00
John Chilton 6081c0bc83 Merge remote-tracking branch 'jmchilton/dev' into ftp_uploader
Conflicts:
 static/scripts/bundled/libs.bundled.js
 static/scripts/bundled/libs.bundled.js.map
2017-10-09 08:47:34 -04:00
Dannon Baker e671138e93 Fix trackster scoping issues causing a failed load. 2017-10-06 12:11:01 -04:00
Dannon Baker 08f9700f26 Fix 'this' scoping bug in base-creator. 2017-10-06 08:07:48 -04:00
Dannon Baker 9385a37c4c Reorder defines for multi-panel. 2017-10-05 16:59:44 -04:00
Dannon Baker 76676085cb fix missing _l import in multi-panel 2017-10-05 10:29:07 -04:00
Dannon Baker be7bfc5ec2 Merge remote-tracking branch 'upstream/dev' into es6 2017-10-04 16:55:18 -04:00
Dannon Baker 0b3f5e9ab3 One more explicit var fix in workflow-manager. 2017-10-04 16:24:41 -04:00
Dannon Baker 392dfee0fb Slight cleanup and a few definition fixes in workflow-manager. 2017-10-04 16:23:10 -04:00