Commit Graph
3908 Commits
Author SHA1 Message Date
John Chilton 606c32998f Allow upload to collections.
- New upload tab for "Collections".
  - This has a new option to select "Collection Type" in footer.
  - Collection upload geared toward homogeneous datasets - must specify genome and file format for all files.
  - New button "Build" after all individual datasets have finished their upload to the server.
  - Clicking "Build" launches the appropriate collection builder for selected collection type.
  - By default, uploading a collection hides the original uploaded datasets (can be unchecked).

Implement tests for all uploaded collection types.
2017-03-28 09:31:26 -04:00
anuprulez 0809c19c36 Merging with dev 2017-03-28 00:20:34 +02:00
Martin Cech 810a96caef Merge branch 'dev' into collection_builder_enhancements 2017-03-27 17:11:42 -04:00
anuprulez 50a51575f1 Merging with dev 2017-03-26 13:33:41 +02:00
John Chilton 5fa546749b Allow collection builders to hide original datasets. 2017-03-24 10:07:48 -04:00
John Chilton d270a21908 Allow non-ready jobs in collection builder.
This includes two parallel changes to the Selenium tests.

- It adds a decorator to allow retrying certain atomic actions that may occur during jQuery transitions automatically.
- It refactors things to allow waiting on HIDs to become visible instead of just green.
2017-03-24 10:06:32 -04:00
Dannon Baker ca36c0dbfd Have tool-search listen to change as well as keyup 2017-03-23 10:15:44 -04:00
Dannon Baker 7fdb4064c6 Trim down one translation, thanks @mvdbeek 2017-03-23 06:54:17 -04:00
Dannon Baker c58fa9a349 Rebuild client and merge from upstream. 2017-03-22 10:25:11 -04:00
John Chilton 2eefe8571a Fix usage of _.extend in joint collection builder templates.
Fixes bug introduced in #3781. #minor
2017-03-22 08:57:16 -04:00
Dannon Baker 8eb40ae7fb Correct 'Get Data' usage, since we won't be translating that in the first pass 2017-03-21 17:55:25 -04:00
Dannon Baker 54af197967 Add more translation points for localization. 2017-03-21 17:40:47 -04:00
Dannon Baker 269aac614b Apply some suggested FR localization wording changes. 2017-03-21 16:26:21 -04:00
Martin Cech 3dcd174f2b repack 2017-03-21 11:49:09 -04:00
Martin Cech 234361253a Merge branch 'dev' into add_hdca_to_library 2017-03-21 11:47:47 -04:00
Martin Cech 7a6579878a fix markup and add a stylistic space 2017-03-21 10:41:35 -04:00
John Chilton 18cb50ecea Abstraction for re-use between collection creators.
The new mixin reduces the duplication between the list and list of paired collection creators.

I'd like to add functionality related to hiding the original datasets (especially useful for direct upload of collections but previously requested also) but I'd like to reduce the duplication related to doing that first. This is a start in that direction.
2017-03-20 16:16:51 -04:00
Dannon Baker ae049fe540 Merge more fixes, rebuild. 2017-03-17 12:24:04 -04:00
Dannon Baker dc201094aa Duplicated word in localization 2017-03-17 12:22:31 -04:00
Dannon Baker 576ad4f95a Add preferences to core translations, update search datasets 2017-03-17 12:04:12 -04:00
Dannon Baker fe35ed009e Fix localization of Preferences 2017-03-17 11:50:10 -04:00
Dannon Baker 11ee6ea638 Fix 'logged in as' localization usage. 2017-03-17 11:44:01 -04:00
Dannon Baker 0221bdf9c7 One last rebuild w/ final changes. 2017-03-17 11:39:40 -04:00
Dannon Baker 78074243d7 Forgot localization for 'Login' 2017-03-17 11:32:37 -04:00
Dannon Baker 9704b73500 Build client. 2017-03-17 11:29:02 -04:00
Dannon Baker 4f82467117 FR locale masthead support. 2017-03-16 09:45:49 -04:00
Dannon Baker d4462cb321 Localization support for menu. 2017-03-16 09:40:06 -04:00
Dannon Baker d7e4e8e162 Readability formatting for existing locales to set a standard moving forward. 2017-03-16 09:05:04 -04:00
Dannon Baker e7b1d45a39 Add some basic (likely awful) FR translations just to check the machinery here. 2017-03-16 08:49:47 -04:00
Dannon Baker 02327e7085 Add FR localization template (the actual files). Needs translation next. 2017-03-16 08:37:02 -04:00
Dannon Baker d0eaeff9c4 Add FR localization template. Needs translation next. 2017-03-16 08:34:48 -04:00
Dannon Baker 977b1acc48 Remove duplicate keys from nls locales. 2017-03-16 08:31:28 -04:00
Dannon Baker 0498c7f833 Merge pull request #3446 from guerler/ui_pref_routing
Improve routing for user preference views
2017-03-15 11:30:50 -04:00
Nate Coraor 08f66a924b GIE container waiting and swarm management.
1. Create a new API endpoint and client spin to wait for GIE containers to
   become ready. IEs are not required to use it, but usage does require
   a slight change to their `load_notebook()` functions.

2. Add a Docker swarm manager daemon that runs automatically
   to add nodes when services are waiting, clean up exited services, and
   remove idle nodes. Shuts down automatically when there's nothing to
   do.

The format of the GIE proxy session database has changed, if GIEs are
running when you restart Galaxy, they will be interrupted. If you run
the GIE proxy separate from Galaxy, you should restart it after
upgrading.
2017-03-13 21:31:55 -04:00
guerler 7523ff6983 Add random identifier to request url in order to allow proper reload upon multiple navigation requests 2017-03-10 14:07:15 -05:00
guerler 20916c16a9 Remove back button to simplify routing, avoid failing returns 2017-03-10 10:36:31 -05:00
guerler 05a689e2ad Merge branch 'dev' into ui_pref_routing 2017-03-10 10:20:00 -05:00
guerler 5df0187d42 Merge branch 'dev' into ui_pref_routing 2017-03-09 13:45:15 -05:00
guerler 6e32b0f7c1 Use routing helper to navigate to tool form 2017-03-09 13:44:15 -05:00
Dannon Baker 90108e450f tool-form needs to not be required at the top level of the Galaxy webapp 2017-03-08 15:38:38 -05:00
anuprulez 0bfe9fa7ca Merging with dev 2017-03-07 21:46:26 +01:00
Dannon Baker 006801ba1a Escape FTP filename. Thanks @yhoogstrate 2017-03-07 07:43:45 -05:00
guerler 477626385c Filter tags by query term 2017-03-06 18:48:58 -05:00
Dannon Baker f8e6b84998 Compose tag:value serverside -- we don't benefit from having them split when shipped (yet) 2017-03-06 18:46:05 -05:00
Dannon Baker 278da1b356 Merge remote-tracking branch 'upstream/dev' into nametags_to_value 2017-03-06 17:36:04 -05:00
Dannon Baker 942f0d98d9 Only compose tag:value one time on the client. 2017-03-06 17:29:33 -05:00
Dannon Baker d20e19e85a Include values in tags and tag selection lgoic 2017-03-06 16:30:26 -05:00
guerler a52695dee6 Escape title for select labels 2017-03-06 16:01:35 -05:00
guerler 496f476b30 Fix tag escaping 2017-03-06 15:58:31 -05:00
guerler ecaf1be02f Show tags in select search field 2017-03-06 15:15:35 -05:00