 John Chilton
|
aee38feeb4
|
Merge remote-tracking branch 'galaxyproject/dev' into gie-generic
Conflicts:
static/maps/layout/menu.js.map
static/scripts/bundled/libs.bundled.js
static/scripts/bundled/libs.bundled.js.map
static/scripts/layout/menu.js
|
2016-04-04 13:00:21 -04:00 |
|
|
Martin Cech
|
93b7473be8
|
remove deprecated user-facing lib link;
remove 'published' from the menu items for shared elements
|
2016-03-23 15:20:06 -04:00 |
|
|
Eric Rasche
|
1c94fdd528
|
Merge in master
|
2016-03-17 13:48:58 +00:00 |
|
|
Eric Rasche
|
755465cf94
|
Merge in master
|
2016-03-17 13:47:10 +00:00 |
|
|
Eric Rasche
|
50770c962a
|
Repack client
|
2016-03-17 13:45:41 +00:00 |
|
|
guerler
|
4976945ab0
|
Fix icon sizes
|
2016-03-15 17:21:21 -04:00 |
|
|
Dannon Baker
|
370ea10f75
|
Use real routes for tours, and make them actually work. Now it's
possible to open the tour index in a new tab, etc., instead of just
using javascript craziness.
|
2016-03-04 16:23:58 -05:00 |
|
|
Eric Rasche
|
05171a7bc5
|
Correct URL, fix compiled artefact
|
2016-02-24 18:02:18 -06:00 |
|
|
Eric Rasche
|
ba6b06cecb
|
Merge in master
|
2016-02-24 16:49:46 -06:00 |
|
|
Eric Rasche
|
28172499d9
|
Update bundle
|
2016-02-24 16:47:43 -06:00 |
|
|
Dannon Baker
|
33ebeb801d
|
Use backbone routing for a tours URL, since there's no serverside endpoint.
|
2016-02-04 10:21:49 -05:00 |
|
|
guerler
|
e52626b279
|
Apply fix from 16.01
|
2016-01-14 09:09:57 -05:00 |
|
|
guerler
|
0ccb72160a
|
Refactor masthead render to improve readibility
|
2016-01-14 09:04:41 -05:00 |
|
|
guerler
|
4b5b970d78
|
Fix disabled css
|
2016-01-13 20:50:40 -05:00 |
|
|
guerler
|
37f8038d63
|
Undo user icon in masthead
|
2016-01-13 14:31:40 -05:00 |
|
|
Dannon Baker
|
a1a549ea67
|
Re-add identifiers to masthead, new ones for scratchbook (thanks @guerler)
|
2016-01-05 14:04:22 -05:00 |
|
|
Dannon Baker
|
1d97e4271e
|
Merge dev to include menu/onclick fix.
|
2016-01-05 11:00:10 -05:00 |
|
|
Dannon Baker
|
62b80dfcc5
|
Fix onclick broken in #1407
|
2016-01-05 10:04:03 -05:00 |
|
|
Dannon Baker
|
4ef3e21c95
|
Fix onclick handling broken w/ #1407
|
2016-01-05 09:44:06 -05:00 |
|
|
Dannon Baker
|
da8b943f53
|
Merge.
|
2016-01-04 19:23:06 -05:00 |
|
|
guerler
|
c9870cb89d
|
Fix url formatting
|
2016-01-04 08:34:56 -05:00 |
|
|
guerler
|
4cd621dd37
|
Add test cases
|
2015-12-31 01:46:37 -05:00 |
|
|
guerler
|
339ad57f3f
|
Cleanup Masthead and Scratchbook
Cleanup Masthead and Scratchbook
|
2015-12-30 16:31:59 -05:00 |
|
|
Dannon Baker
|
0203a69d88
|
Tours.
|
2015-12-18 10:26:22 -05:00 |
|
|
Dannon Baker
|
04f5ed4552
|
Reimplement menu onclick functionality that appears to have been dropped (probably a bad merge?) in the webpack PR.
|
2015-12-17 19:35:17 -05:00 |
|
|
carlfeberhard
|
9c5d4cfc0e
|
(merge dev)
|
2015-11-20 10:29:23 -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
|
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 |
|