carlfeberhard
baeaae9905
Webpack: rebuild bundles using webpack 1.12.8 as defined in the package.json
2015-11-20 16:01:59 -05:00
carlfeberhard
51e0986490
Webpack: add in the libs bundles, Carl. They're kinda important.
2015-11-20 15:43:06 -05:00
carlfeberhard
dba7e6640f
Webpack: correct handlebars template generation to return an AMD function - this normalizes import of templates between webpack and require, fix sweepster tools import and templates
2015-11-20 12:36:05 -05:00
carlfeberhard
9c5d4cfc0e
(merge dev)
2015-11-20 10:29:23 -05:00
carlfeberhard
7cd5713dbb
Webpack: simplify query routes in analysis, remove duplicate js in display.mako and tabular_chunked.mako, change order of requirejs import; testing, casperjs: quiet requirejs scripterrors when navigating away from pages
2015-11-20 10:08:44 -05:00
Dannon Baker
f61ec1c3c0
Merge and rebuild client
2015-11-19 20:34:32 -05:00
Dannon Baker
0fdca7d40a
A large assortment of escaping fixes to primarily grids and javascript templating, and one bad-data-ingress fix (copy history name).
2015-11-19 20:27:25 -05:00
carlfeberhard
5eb9b206e7
Webpack: properly add login app to the repo
2015-11-18 15:29:16 -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
Nicola Soranzo
c252987b4c
Merge branch 'master' into dev
2015-11-18 10:15:22 +00:00
Nicola Soranzo
3ffa607c15
Deprecate old library UI in the "Shared Data" menu.
2015-11-17 17:24:39 +00: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
Nate Coraor
d8152f3336
Merge branch 'release_15.10' into dev
2015-11-17 11:37:05 -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
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
guerler
6580701395
Fix parsing of message configuration
...
Fix default value
Add root to Galaxy object
2015-11-10 23:51:29 -05:00
Marius van den Beek
36797b3195
Add changed static files.
2015-11-10 12:25:01 -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
carlfeberhard