guerler
e6399874e8
Charts: Fix missing data message
2015-02-24 19:41:30 -05:00
guerler
e2f5e9e326
Charts: Rebuild and update charts
2015-02-24 19:08:36 -05:00
guerler
475fcf6f2d
Show error message on server error
2015-02-24 18:37:52 -05:00
guerler
af79513e51
Merge branch 'release_15.03' of https://github.com/galaxyproject/galaxy into release_15.03
2015-02-24 18:14:13 -05:00
Carl Eberhard
86035ed64a
Merge remote-tracking branch 'upstream/release_15.03' into release_15.03
2015-02-24 17:34:47 -05:00
Carl Eberhard
c59980b7b1
Fix to layering of dropdown buttons and menus
2015-02-24 17:20:10 -05:00
guerler
3c0275ae52
Fix job ids in success message
2015-02-24 15:52:51 -05:00
guerler
fc23aee3a6
Allow text selection in tool form
2015-02-24 15:52:17 -05:00
Dannon Baker
2fb5d0cd02
Apply custom_types bugfixes from dev branch to release.
2015-02-24 14:50:02 -05:00
Daniel Blankenberg
ca41396d2a
Fix for installing .loc files from the toolshed to respect shed_tool_data_path. Mention shed_tool_data_path in galaxy.ini.sample.
2015-02-24 12:02:42 -05:00
John Chilton
77b167bbd1
Comment out broken liftOver tests.
...
liftOver loc file handling is problematic (https://trello.com/c/A6I6zQvF ). If it weren't this wouldn't be a problem. I could fix the API functional test framework to mimic the older form driven approach but it would take a week and would be rendered moot by fixing liftOver. Unfortunately, fixing liftOver would likely break a lot of existing workflows and tool reruns so I am not fixing that either.
Only option left, admittedly a crappy one, is to comment out the tests.
2015-02-23 23:09:19 -05:00
John Chilton
2bcc9e202e
Fix for watching tools on some more interesting file systems.
2015-02-23 19:58:12 -05:00
Carl Eberhard
7a256045bb
UI, history panel: correctly default clearMessages target when no event is given
2015-02-23 17:14:37 -05:00
Dannon Baker
23179f3b48
Verify and apply @jmchilton's fix from https://github.com/jmchilton/galaxy-central/commit/306a86558a7ee7be1bc2d68cd939b16b5f1863d4 to next-stable. Should be refactored into using the same galaxy.menu.js objects -- I'm assuming that's why things like PopupMenu.fromExistingDom exist and are otherwise unused.
2015-02-23 16:28:01 -05:00
Dannon Baker
d54b3b08c7
Merge branch 'cancelfix' into release_15.03
2015-02-23 15:08:31 -05:00
Dannon Baker
74336019ff
Bugfix for clicking cancel in a menu and having the action happen anyway.
2015-02-23 15:07:58 -05:00
Martin Cech
c6237def42
fix error preventing change of username in TS
2015-02-23 13:53:13 -05:00
guerler
cec5854398
Select2 fix
2015-02-23 12:50:27 -05:00
Dannon Baker
a6b13a28a0
Clone .gitignore
2015-02-23 11:28:07 -05:00
Daniel Blankenberg
cebd5f8b77
Fixes for handling Data Managers that use undeclared data tables.
2015-02-21 13:29:58 -05:00
Dannon Baker
f2771f77fb
Merge back from next-stable.
2015-02-17 15:20:40 -05:00
Dannon Baker
815b3a271f
Merge.
2015-02-17 15:19:40 -05:00
Dannon Baker
3a8b2bf93a
Merge.
2015-02-17 15:19:00 -05:00
Dannon Baker
5c94d23d2d
Merge bugfix from next-stable.
2015-02-17 15:18:45 -05:00
Dannon Baker
f22ef12467
Fix xml.etree relative import error happening in test/asserts/xml.py
2015-02-17 15:18:08 -05:00
Daniel Blankenberg
8d48f1753d
For select tool parameter, when testing input values, raise ValueErrors instead of assert/AssertionErrors, as ValueError are cased to be caught. Fixes errors on rerun, when options have been removed.
2015-02-17 15:17:17 -05:00
Daniel Blankenberg
fb2c30594b
For select tool parameter, when testing input values, raise ValueErrors instead of assert/AssertionErrors, as ValueError are cased to be caught. Fixes errors on rerun, when options have been removed.
2015-02-17 15:17:17 -05:00
Dannon Baker
38c03b9b8b
Apply fix from next-stable.
2015-02-17 15:09:13 -05:00
Dannon Baker
0afbfdefc7
Fix another identity vs value test error in xml handling.
2015-02-17 15:08:45 -05:00
John Chilton
bc9548753d
Fix tool shed tests for GALAXY_TEST_DB_TEMPLATE unset.
...
I guess everyone who has ran tool shed tests in the last couple years has set either that or GALAXY_TEST_DBURI? Odd.
2015-02-17 14:02:04 -05:00
Carl Eberhard
3027cc213f
merge
2015-02-17 09:57:34 -05:00
Carl Eberhard
cb761a457b
merge
2015-02-17 09:57:18 -05:00
Carl Eberhard
d209df39f8
merge
2015-02-17 09:54:52 -05:00
Carl Eberhard
7ae7dd81d0
UI: Move action menu rendering into list panel, refactor history contents copying
2015-02-17 09:54:36 -05:00
Dannon Baker
fc47c6bd1c
Merge PR over from default.
2015-02-17 09:50:58 -05:00
Dannon Baker
d91ce3f6cd
Merged in erasche2/galaxy-central (pull request #570 )
...
Enable user/email list for sharing of datasets
2015-02-17 09:46:09 -05:00
Nate Coraor
5b2ab6ace7
Open next-stable for 15.03 release.
2015-02-17 09:28:43 -05:00
Dannon Baker
c7acc4f8b1
Merge.
2015-02-17 09:27:27 -05:00
Dannon Baker
599341f3a3
Update requirements.txt for SQLAlchemy 0.9.8 (tip)
2015-02-17 09:26:53 -05:00
Nate Coraor
9d88691826
Allow latest SQLAlchemy in requirements.txt
2015-02-17 09:23:34 -05:00
Dannon Baker
0d58784773
Merge.
2015-02-17 09:16:11 -05:00
Nate Coraor
3c10a61a12
Update tag latest_2015.01.13 for changeset d677cb314dcc
2015-02-17 09:00:22 -05:00
Dannon Baker
10d94d8617
Supply remote annotation for complex mappings (also squelches a warning which was causing job failures)
2015-02-17 08:37:37 -05:00
Dannon Baker
7b885c9e17
Merge.
2015-02-17 07:26:52 -05:00
Carl Eberhard
579edf01b1
UI, History: allow purging, implement purge option in multi-view dropdowns; Managers: fix purgable return value; API, histories: return purged in summary view
2015-02-16 17:51:51 -05:00
Aysam Guerler
e6c04acf70
Parameters: Fix late validation criteria
2015-02-16 17:26:09 -05:00
Carl Eberhard
d2155a5eb0
API, configuration: use getattr instead of config.get since get is limited
2015-02-16 16:40:24 -05:00
Aysam Guerler
3beae622d9
Workflow: Remove tool model from module data
2015-02-16 16:14:05 -05:00
Carl Eberhard
11f4e97642
Dataproviders, column: correct max split in filter parsing
2015-02-16 15:19:35 -05:00
Dannon Baker
61decad8c3
Bump SQLAlchemy all the way to 0.9.8
2015-02-16 15:09:42 -05:00
guerler