 Nicola Soranzo
|
d807ed0f75
|
Merge branch 'release_17.05' 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
static/scripts/bundled/login.bundled.js.map
|
2017-06-02 15:05:14 +01:00 |
|
|
Dannon Baker
|
20d2303d34
|
Merge remote-tracking branch 'upstream/release_17.05' into dev
|
2017-06-01 13:39:36 -04:00 |
|
|
Dannon Baker
|
c260e0b0c8
|
Sort tags for display (note, this is stupid to have in 3 places -- refactor)
|
2017-06-01 10:38:13 -04:00 |
|
|
Dannon Baker
|
f3aa53261d
|
Improved styling of workflow list. Removed unused class, used hierarchy in base.less.
|
2017-06-01 09:48:44 -04:00 |
|
|
guerler
|
c409572ef8
|
Handle potential regex expression in workflow parameter names
|
2017-05-31 16:28:18 -04:00 |
|
|
Dannon Baker
|
b6597d43f3
|
Merge remote-tracking branch 'upstream/release_17.05' into dev
|
2017-05-31 15:06:35 -04:00 |
|
|
Dannon Baker
|
5c954139fa
|
Since we're using addClass to inject status type, it's not necessary to escape this one.
|
2017-05-30 14:27:06 -04:00 |
|
|
Dannon Baker
|
8080c08ae6
|
Fix escaping of status/message passed by querystring in the new workflow
menu.
|
2017-05-30 14:24:59 -04:00 |
|
|
Dannon Baker
|
2ac04bbf09
|
Uniqueify hashtag display
|
2017-05-26 13:30:21 +01:00 |
|
|
anuprulez
|
852aa51225
|
Making one api url for getting and setting workflows menu
|
2017-05-23 11:12:57 +02:00 |
|
|
anuprulez
|
56fcd293b5
|
Fixing PR review comments
|
2017-05-22 19:26:44 +02:00 |
|
|
anuprulez
|
60cb6b4d31
|
Fixing PR review comment to split api calls into two
|
2017-05-22 15:28:53 +02:00 |
|
|
anuprulez
|
358ce8013f
|
Merging with dev
|
2017-05-22 14:44:56 +02:00 |
|
|
anuprulez
|
b9b4587073
|
Replacing the centerPanel by this.page in analysis.js
|
2017-05-19 14:06:50 +02:00 |
|
|
anuprulez
|
f0d28992a4
|
Merging with dev
|
2017-05-19 13:50:51 +02:00 |
|
|
anuprulez
|
64312c4331
|
Adding styling and back button to configure workflow menu page
|
2017-05-19 13:43:26 +02:00 |
|
|
Dannon Baker
|
aa85760996
|
Rebuild to provide new localization.
|
2017-05-18 12:05:03 -04:00 |
|
|
Martin Cech
|
b9fb2de42b
|
Merge pull request #3626 from davebx/ts_api_backbone
API installation of toolshed repositories.
|
2017-05-17 13:22:48 -04:00 |
|
|
Martin Cech
|
5eadd4842d
|
Merge branch 'release_17.05' into dev
|
2017-05-16 15:55:16 -04:00 |
|
|
Martin Cech
|
fc69a85100
|
add new translatable strings to the locale file
|
2017-05-16 13:30:22 -04:00 |
|
|
guerler
|
220fff9e9b
|
Add localization support for admin panel labels
|
2017-05-16 12:49:04 -04:00 |
|
|
guerler
|
a476db0253
|
Add active view attribute, add monitoring ids
|
2017-05-16 10:25:46 -04:00 |
|
|
Dannon Baker
|
d3427a1344
|
Rebuild
|
2017-05-15 18:14:06 -04:00 |
|
|
anuprulez
|
91d08cc746
|
New file for configure workflow menu and adding check and uncheck all buttons
|
2017-05-15 23:25:16 +02:00 |
|
|
guerler
|
b2b84a8e62
|
Merge branch 'dev' into admin_app
|
2017-05-15 16:53:23 -04:00 |
|
|
guerler
|
bd83608a2f
|
Fix global grid action events
|
2017-05-15 14:21:17 -04:00 |
|
|
guerler
|
fe59e3aeb4
|
Fix overlapping css tags
|
2017-05-15 10:20:37 -04:00 |
|
|
guerler
|
2399df09cc
|
Remove unused parts, comments
|
2017-05-15 10:08:50 -04:00 |
|
|
guerler
|
866ddb4bcc
|
Repack scripts
|
2017-05-15 09:39:57 -04:00 |
|
|
guerler
|
f01c20fc7d
|
Fix style
|
2017-05-15 09:38:08 -04:00 |
|
|
guerler
|
0423dbc890
|
Pack scripts
|
2017-05-15 09:14:48 -04:00 |
|
|
guerler
|
7de2b6b6ed
|
Add conditions and additional attributes
|
2017-05-15 09:13:03 -04:00 |
|
|
guerler
|
e64c195ffc
|
Load initial page
|
2017-05-15 08:35:20 -04:00 |
|
|
guerler
|
25eb885097
|
Add additional properties
|
2017-05-15 08:27:05 -04:00 |
|
|
guerler
|
b92099611c
|
Remove debug statement
|
2017-05-15 07:51:10 -04:00 |
|
|
guerler
|
d131e1bd6c
|
Convert definitions into collection
|
2017-05-15 07:49:29 -04:00 |
|
|
guerler
|
dcf177f212
|
Add all admin panel links
|
2017-05-15 07:46:39 -04:00 |
|
|
guerler
|
ee676aef42
|
Add tool shed related menu items
|
2017-05-15 00:59:00 -04:00 |
|
|
guerler
|
6d19f59596
|
Prepare model structure for categories
|
2017-05-15 00:45:37 -04:00 |
|
|
guerler
|
a00f7f6513
|
Insert admin app, redirect controller
|
2017-05-15 00:18:28 -04:00 |
|
|
anuprulez
|
5d48e62eea
|
Removing unused code
|
2017-05-15 01:06:59 +02:00 |
|
|
anuprulez
|
fd2e8fe517
|
Replacing configure_menu mako by JavaScript
|
2017-05-15 00:54:35 +02:00 |
|
|
bagnacan
|
878c6657b4
|
conditional postclick execution onNext
|
2017-05-12 17:07:58 +02:00 |
|
|
Dannon Baker
|
aab8833424
|
Merge commit 'e49e5e5417e8e2ebc0347b9cbbdf91c52d4779eb' into dev
|
2017-05-12 09:43:53 -04:00 |
|
|
guerler
|
e49e5e5417
|
Fix test cases
|
2017-05-12 03:46:47 -04:00 |
|
|
John Chilton
|
04bb1e85cd
|
[17.05] Fix FTP upload of multiple files in collection uploader.
|
2017-05-11 15:37:50 -04:00 |
|
|
Nicola Soranzo
|
2eeabc00b1
|
Merge branch 'release_17.05' 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
|
2017-05-11 19:30:20 +01:00 |
|
|
guerler
|
500ae33e1f
|
Fix router
|
2017-05-11 14:28:23 -04:00 |
|
|
guerler
|
fad855d29b
|
Make client
|
2017-05-11 14:26:45 -04:00 |
|
|
guerler
|
b3529e78c0
|
Merge branch 'dev' into refactor_panels_000
|
2017-05-11 14:19:37 -04:00 |
|