carlfeberhard
c15e5db2ec
(manually merge conflicts)
2016-03-07 16:15:38 -05:00
Dannon Baker
0036785769
Merge, rebuild.
2016-03-04 16:29:13 -05: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
carlfeberhard
22148c26c1
(merge conflicts)
2016-03-04 08:14:50 -05:00
Dannon Baker
8dd24734e3
Minor followup to 1846
2016-03-03 12:25:06 -05:00
Dannon Baker
1220e2e978
Prevent tours from kicking off within iframes, causing duplicate tour step display.
2016-03-03 08:31:17 -05:00
John Chilton
eb2005e7a2
Merge pull request #1764 from guerler/fix_check_and_update_000
...
Use visit inputs for check_and_update_param_values
2016-03-01 12:40:16 -05:00
guerler
bc33f9b182
Fix upload tool routing
2016-02-29 22:05:29 -05:00
Nicola Soranzo
93069676e6
Merge branch 'release_16.01' into dev
...
Conflicts:
static/style/blue/base.css
2016-02-25 17:54:16 +00:00
guerler
d3b343acab
Use visit_inputs for check_and_update_param_values
2016-02-24 21:26:30 -05:00
Nate Coraor
1f530b45b3
Merge branch 'release_16.01' into dev
2016-02-24 10:58:54 -05:00
carlfeberhard
7855e0009d
(merge conflicts)
2016-02-24 09:22:31 -05:00
carlfeberhard
3f15d5af21
UI, histories: rework update system to check contents based on update times of contents and only stop checking when history has no more running jobs
2016-02-24 09:20:24 -05:00
Nicola Soranzo
390d3b7eb7
Merge branch 'release_16.01' into dev
...
Conflicts:
static/scripts/bundled/analysis.bundled.js.map
static/scripts/bundled/libs.bundled.js
static/scripts/bundled/libs.bundled.js.map
2016-02-23 18:13:22 +00:00
John Chilton
dbab6f5b97
Workaround for #1739 - fixing up subworkflow inut connections.
...
Do the same relaxed thing we do for inputs of type 'input' as we do for outputs of this type. Someday we should have better tracking, but such a change is probably not wise for a release branch.
2016-02-22 21:46:03 +00:00
carlfeberhard
040fb8185b
Merge pull request #1751 from martenson/libraries-refactor
...
various libraries refactoring and bugfixes
2016-02-19 11:57:10 -05:00
guerler
89759a00c1
Remove DummyDataset
2016-02-18 17:41:41 -05:00
guerler
7ea4668ff7
Remove former populate_state
2016-02-18 17:41:38 -05:00
guerler
580895af1d
Revision
2016-02-18 17:40:30 -05:00
guerler
7b8f675172
Place logo into config, add masthead test cases
2016-02-18 17:40:28 -05:00
Nicola Soranzo
a0537762f2
Merge branch 'release_16.01' into dev
...
Conflicts:
static/scripts/bundled/analysis.bundled.js
static/scripts/bundled/analysis.bundled.js.map
static/scripts/bundled/libs.bundled.js.map
2016-02-18 19:52:23 +00:00
carlfeberhard
84de6b4ed3
Fix target or window.location when importing histories from display.mako (shared with me->view) to allow for iframes; silence popup-menu.js when menu is closed due to location change
2016-02-17 14:41:08 -05:00
Martin Cech
b50cf13379
refactor library dataset permissions API to use role manager
...
fix a bug in making dataset private (when you called it multiple
times it would always add a new datasetpermission)
various refactorings of JS and py
2016-02-17 11:59:00 -05:00
Martin Cech
e28f329008
add selects for dataset genome build and extension
...
minor stylistic fix for column width
2016-02-17 11:58:44 -05:00
Martin Cech
535b689cbc
style the toolbar of dataset view templates
2016-02-17 11:57:22 -05:00
Martin Cech
8f8da0105e
fix router returning from dataset permissions back to dataset
2016-02-17 11:56:08 -05:00
Martin Cech
fcca59c70f
refactor; mainly the templates
2016-02-17 11:56:08 -05:00
Martin Cech
0ae21aeb62
fix returning from versioned dataset view back to the latest
2016-02-17 11:56:07 -05:00
Martin Cech
22e84e4814
repack client after merge conflicts
2016-02-09 13:31:30 -05:00
Martin Cech
db9c0b89ab
Merge release_16.01 into dev
2016-02-09 13:23:27 -05:00
Martin Cech
776180ab80
show all available information for current library and the opened folder
2016-02-09 10:24:02 -05:00
Martin Cech
8acc7ebc04
repack client
2016-02-08 12:02:18 -05:00
Martin Cech
308402235f
Merge release_16.01 into dev
2016-02-08 11:54:01 -05:00
Martin Cech
054c04f490
Merge pull request #1695 from natefoo/help-message-css
...
[16.01] Update help text rST note/warning/error box styling for change in div class from toolHelpBody to ui-form-help.
2016-02-08 10:41:54 -05:00
Nate Coraor
5e77af198a
Update help text rST note/warning/error box styling for change in div
...
class from toolHelpBody to ui-form-help.
2016-02-08 09:47:07 -05:00
Martin Cech
7867f3e083
accept json as input for setting permissions;
...
fix inconsistency by leveraging role_manager
2016-02-04 15:51:57 -05:00
Dannon Baker
ab5f153617
Clientside routing for tour kickoff, swapping from ?tour_id=foo approach.
2016-02-04 10:23:18 -05: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
Dannon Baker
61f168d34b
A slightly different check for Galaxy object definition that doesn't assume a window-attached Galaxy context, only a parent. Minor cleanup.
2016-02-04 10:19:26 -05:00
John Chilton
d93f095c7f
Merge remote-tracking branch 'jmchilton/param_argument_fix' into dev
...
Conflicts:
static/scripts/bundled/analysis.bundled.js
static/scripts/bundled/analysis.bundled.js.map
static/scripts/bundled/libs.bundled.js
static/scripts/bundled/libs.bundled.js.map
2016-02-03 14:52:36 +00:00
Nate Coraor
246870c459
Merge branch 'release_16.01' into dev
2016-02-03 13:11:07 -05:00
John Chilton
d7dd9f9040
Rebuild client stuff for #1650 .
2016-02-03 14:37:27 +00:00
Bjoern Gruening
45f523f922
fix show_welcome_with_login = True
2016-02-03 15:19:09 +01:00
Nicola Soranzo
a8be2222eb
Merge branch 'release_16.01' into dev
...
Conflicts:
static/scripts/bundled/analysis.bundled.js
static/scripts/bundled/analysis.bundled.js.map
static/scripts/bundled/libs.bundled.js.map
static/style/blue/base.css
2016-02-02 19:42:42 +00:00
Daniel Blankenberg
dacb91907a
Merge pull request #1562 from martenson/datalibs_better_foldermanagement
...
datalibs: introduce folder management; fix various glitches; refactor
2016-02-01 11:37:43 -05:00
guerler
61818948a1
Fix default option for repeats
2016-02-01 11:31:50 -05:00
guerler
399e0ced6d
Disable individual file metadata changes in upload
2016-01-29 22:51:21 -05:00
Dannon Baker
f8e6a55ab7
Swap to standard url parsing function from our js utils.
2016-01-29 14:43:35 -05:00
Dannon Baker
bf5bf73e82
Tour cleanup, remove a few globals.
2016-01-29 13:51:31 -05:00
Martin Cech
11c5259f46
fix librarydataset model detection;
...
always show dataset.message and folder.description
2016-01-29 10:17:48 -05:00
carlfeberhard