carlfeberhard
b8870bfedc
(merge dev)
2015-11-16 10:09:58 -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
cc6c15f3b1
Webpack: normalize tags, annotations, and tools (change refs - 3 of 3)
2015-11-13 16:28:39 -05:00
carlfeberhard
894af4c5de
Webpack: normalize tags, annotations, and tools (2 of 3)
2015-11-13 16:11:26 -05:00
carlfeberhard
6f754216a4
Webpack: normalize list-panel to list-view
2015-11-13 16:05:52 -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
jgoecks
ce418d33fe
Resolve conflicting label CSS class.
2015-11-13 14:10:10 -05:00
carlfeberhard
55068dea28
Webpack: normalize 'panel' names part-2: history and collection modules
2015-11-12 16:15:49 -05:00
carlfeberhard
c66bc7ab76
Webpack: normalize history and panel module names with other mvc modules (history-panel is not a panel - just a view)
2015-11-12 15:17:32 -05:00
carlfeberhard
6d0ab669ec
Webpack: correctly load jQuery-ui, require bibtex in citations, and move polyfills to first loaded
2015-11-12 15:06:17 -05:00
carlfeberhard
372c2e9e43
Webpack: move data.js into dataset/data.js; pack scripts
2015-11-12 14:52:11 -05:00
carlfeberhard
2f0b646137
Webpack: move tools.js into mvc/tools/
2015-11-12 14:41:45 -05:00
carlfeberhard
93629bb29e
Webpack: add handlebars loader, update tools.js
2015-11-12 14:27:14 -05:00
carlfeberhard
f971e17f95
Webpack: move galaxy.ui.scrollPanel into ui/scroll-panel
2015-11-12 11:17:25 -05:00
carlfeberhard
350a53f1ef
Webpack: move base.Base to trackster (which uses it)
2015-11-12 11:12:34 -05:00
carlfeberhard
215391f571
Webpack: remove galaxy-async
2015-11-12 11:02:09 -05:00
carlfeberhard
78e6253178
Webpack: move old school modal into layout/
2015-11-12 10:59:25 -05:00
Mark Einon
67d0bcb5b3
Trivial: Replace unnecessary duplicated var check with 'else if'
2015-11-12 15:38:18 +00:00
carlfeberhard
dc0b960ea1
Webpack: lowercase DD-helper throughout project to reflect changes in 7717659
2015-11-12 10:08:12 -05:00
carlfeberhard
a4edf159be
(merge dev)
2015-11-12 10:04:38 -05:00
carlfeberhard
c1cc3bd483
Webpack: fix masthead in libraries; update Panel usage in base_panels.mako, galaxy.panels.mako
2015-11-12 09:42:29 -05:00
carlfeberhard
b1266b45dc
Webpack: move panel to Backbone, implement ToolPanel and HistoryPanel; simplify js-app.mako (by removing alternate layouts); clean up debugging info, make Galaxy less chatty before logging setup
2015-11-11 17:48:11 -05:00
Martin Cech
75d6489348
Merge pull request #1049 from mvdbeek/library_add_from_history
...
Fix import of history datasets into library.
2015-11-10 12:22:49 -05:00
Marius van den Beek
4f824cb920
Add changed static files.
2015-11-10 17:37:28 +01:00
Daniel Blankenberg
39ff0e9d76
Merge pull request #1044 from jmchilton/release_15.10_to_dev
...
Bring 15.10 (and 15.07) fixes into dev.
2015-11-10 10:42:02 -05:00
carlfeberhard
a639b0c996
Webpack: move galaxy.masthead and galaxy.menu to layout/masthead and layout/menu, panel to layout/panel, and rename galaxy.frame to layout/scratchbook
2015-11-09 17:06:14 -05:00
carlfeberhard
649a83c1aa
Webpack: (shoulda been 2 sep. commits) re-add minimal DOM for 1,2,3 panel layouts via server-side/js-app.mako, correct noscript tag styling; Instantiate galaxy.frame and galaxy.menu from galaxy.masthead (currently the only user), reverse dependencies in them (masthead imports them), and move GalaxyMastheadTab into galaxy.menu and GalaxyMastheadIcon into galaxy.frame - allowing a single import of galaxy.masthead
2015-11-09 16:40:57 -05:00
carlfeberhard
9c35d35c52
Webpack: make autocom_tagging into a module, export commatize, rename galaxy.base to onload and galaxy.panels to panels
2015-11-09 11:52:28 -05:00
Martin Cech
daccea42bd
Merge pull request #1040 from guerler/revise_logging_000
...
Fix log statements and link to logger
2015-11-09 10:26:54 -05:00
John Chilton
dc534bb258
Merge branch 'release_15.10' into dev
...
Conflicts:
client/galaxy/scripts/mvc/grid/grid-view.js
static/maps/mvc/collection/list-of-pairs-collection-creator.js.map
static/scripts/mvc/collection/list-of-pairs-collection-creator.js
2015-11-09 15:19:02 +00: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
4f242151e7
Webpack: remove libs and history apps, grunt:pack scripts
2015-11-05 15:08:04 -05:00
carlfeberhard
d80d74c888
Client libs: move backbone down into /libs (not backbone/backbone); Webpack: move to non-entry vendor bundling for libraries, clean up assoc.
2015-11-05 12:04:52 -05:00
guerler
975a94ce01
Pack scripts
2015-11-05 10:44:17 -05:00
guerler
bbc3e943e7
Merge branch 'dev' of https://github.com/galaxyproject/galaxy into revise_multiselect_000
2015-11-05 10:43:28 -05:00
guerler
8a9372b989
Merge branch 'dev' of https://github.com/galaxyproject/galaxy into revise_multiselect_001
2015-11-04 11:06:48 -05:00
Dannon Baker
1649570e78
Rebuild client styles, merge.
2015-11-04 08:37:22 -05:00
guerler
5c56ec8bc7
Fix style of labels in grids
...
Fix styles
Pack styles
2015-11-04 04:09:10 -05:00
guerler
0fe684c688
Fix upload button style
...
More fixes
2015-11-04 03:04:38 -05:00
guerler
7717659c78
Allow resizing of regular multi-select boxes
...
Remove event handler
Add mouse leave event handler
Improve visibility and accessibility
Fix tag name
Style compromise
Repack charts
2015-11-04 02:16:45 -05:00
guerler
f57d917949
Patch select2 to avoid resetting highlighted location
...
Keep search term
2015-11-03 15:41:46 -05:00
carlfeberhard
84b40650ec
(merge dev)
2015-11-03 15:12:31 -05:00
carlfeberhard
9a659d85d6
Webpack: use bundled libs in base templates
2015-11-03 14:57:24 -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
142db64fb3
Use remove instead of empty if iframe is shown
2015-11-03 12:48:55 -05:00
Dannon Baker
86648d23e2
Merge pull request #1011 from carlfeberhard/logging
...
Client side logging
2015-11-03 11:01:51 -05:00
Dannon Baker
9fd0bd1cc1
Manual merge and rebuild due to conflict.
2015-11-03 10:54:40 -05:00
guerler
168d42acf3
Keep select field open for multi select
2015-11-03 09:58:24 -05:00
guerler
cc4e8e4a34
Merge branch 'dev' of https://github.com/galaxyproject/galaxy into revise_promise_000
2015-11-02 14:48:52 -05:00
carlfeberhard