Dave Bouvier
9b4b20cb88
Reduce the use of mutable types in method definitions.
2016-02-26 16:07:19 -05:00
Björn Grüning
da50cf1149
Merge pull request #1806 from jmchilton/changeset_problems_fix
...
Ensure tool.changeset_revision is set...
2016-02-26 07:49:44 +01:00
John Chilton
453345c621
Merge pull request #1800 from davebx/fix_ts_tests
...
Port my changes from #1392
2016-02-25 15:29:02 -05:00
John Chilton
09f597ae4b
Merge pull request #1802 from mvdbeek/fix_my_mess
...
Add changeset_revision to tool attributes, avoid self.tool_shed_repos…
2016-02-25 15:27:11 -05:00
John Chilton
6d9ac081c1
Ensure tool.changeset_revision is set...
...
... in some cases tool.tool_shed will be non-null but changeset_revision will be absent. This is my development instance so it is easy to imagine my database doesn't match my tool panel config.
2016-02-25 19:19:23 +00:00
Marius van den Beek
990c0fe535
Add changeset_revision to tool attributes, avoid self.tool_shed_repository
2016-02-25 20:09:44 +01:00
Dave Bouvier
4383e9f808
Reintroduce my changes to get_files methods.
2016-02-25 13:05:17 -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
Dave Bouvier
510543236c
Merge #1392 's modifications into bae03bfe.
2016-02-25 12:39:10 -05:00
Dave Bouvier
bae03bfe3e
Port Nicola's fix to dev.
2016-02-25 12:36:52 -05:00
John Chilton
5546211c0d
Merge pull request #1798 from nsoranzo/release_16.01_tool_shed_test_fixes
...
[16.01] Fix tool shed tests for e4a1d57278
2016-02-25 10:25:29 -05:00
John Chilton
15c08d80e4
Merge pull request #1791 from carlfeberhard/release_16.01
...
[16.01] Fix to 9acbfdf
2016-02-25 10:25:05 -05:00
Nicola Soranzo
7a9d4943cd
Fix tool shed tests for e4a1d57278 .
2016-02-25 13:37:23 +00:00
John Chilton
94f847b3b2
Merge pull request #1755 from nsoranzo/flake8_fixes
...
Fix the remaining 1334 flake8 errors in scripts/ .
2016-02-25 08:11:55 -05:00
John Chilton
5370f2d1cd
Merge pull request #1756 from davebx/fix_bootstrap
...
Some tweaks to bootstrapping.
2016-02-25 08:07:17 -05:00
John Chilton
7560677bd9
Merge pull request #1793 from natefoo/make-release
...
Update makefile and add the script I used to apply security patches for 16.01
2016-02-25 07:53:45 -05:00
John Chilton
4f73c4b5f8
Merge pull request #1794 from natefoo/16.01-security-tests
...
Tests for some of the 16.01 security vulnerabilities
2016-02-25 07:50:31 -05:00
John Chilton
70a96dd79e
Merge pull request #1785 from dannon/26_deprecated
...
Drop python2.6 (deprecated, will not be supported in 16.04) from test…
2016-02-25 07:48:55 -05:00
John Chilton
874540e912
Merge pull request #1796 from nsoranzo/lint_fix
...
Fix unused import.
2016-02-25 07:44:51 -05:00
Nicola Soranzo
87d6467812
Fix unused import.
2016-02-25 11:00:10 +00:00
Nate Coraor
d21cc83fc2
Tests for some of the 16.01 security vulnerabilities
2016-02-24 17:03:39 -05:00
Nate Coraor
8943a0f86b
Add the script I used to create security patches
2016-02-24 16:54:30 -05:00
Nate Coraor
5b515a76cd
Update Makefile for release/point releases
2016-02-24 16:53:18 -05:00
Nate Coraor
b14e35f48b
Add a safe_relpath util function for ensuring a path does not reference an absolute or parent directory
2016-02-24 16:39:15 -05:00
Nate Coraor
5677c2ee4f
Update version to 16.01
2016-02-24 15:29:14 -05:00
Nate Coraor
2656f11b51
Merge branch 'version-16.01' into version-16.04.dev
2016-02-24 15:29:14 -05:00
Nate Coraor
0771e4731c
Merge branch 'release_16.01' into dev
2016-02-24 13:40:22 -05:00
Nate Coraor
70329f64ab
Merge branch 'release_15.10' into release_16.01
2016-02-24 13:38:49 -05:00
Nate Coraor
b5949bcbbf
Update version to 15.10.2
2016-02-24 13:38:48 -05:00
Nate Coraor
21cc5b2da5
Merge branch 'release_15.07' into release_15.10
2016-02-24 13:36:55 -05:00
Nate Coraor
30608c177c
Update version to 15.07.1
2016-02-24 13:36:55 -05:00
Nate Coraor
3d832aff0a
Merge branch 'release_15.05' into release_15.07
2016-02-24 13:34:06 -05:00
Nate Coraor
c8e9845c5c
Update version to 15.05.2
2016-02-24 13:34:05 -05:00
Nate Coraor
3516e94e5c
Merge branch 'release_15.03' into release_15.05
2016-02-24 13:25:57 -05:00
Nate Coraor
0122040fad
Update version to 15.03.4
2016-02-24 13:23:36 -05:00
carlfeberhard
f27ff0c7ba
Fix to 9acbfdf: initial fix borked fa-2x, instead remove second woff loaded due to fa-icon font-family rule by aliasing that to fa
2016-02-24 12:46:06 -05:00
Nate Coraor
63d7b7a212
Merge branch 'release_16.01' into dev
2016-02-24 12:31:59 -05:00
Nate Coraor
c6b010af34
Add security announcement to v16.01 release notes.
2016-02-24 12:30:56 -05:00
Nate Coraor
ed82982f9b
Merge branch 'release_16.01' into dev
2016-02-24 11:18:25 -05:00
Nate Coraor
624e3837bd
Merge branch 'release_15.10' into release_16.01
2016-02-24 11:18:24 -05:00
Nate Coraor
3a006766d3
Security fixes for tool shed hg push and capsule/tarball uploads
2016-02-24 11:18:24 -05:00
Nate Coraor
9e6afea498
Security fixes for tool shed repository browsing
2016-02-24 11:18:24 -05:00
Nate Coraor
ffcd4fe192
Remove sample tracking manual external service transfer due to security concerns
2016-02-24 11:18:24 -05:00
Nate Coraor
7c4b8ff747
Security fixes for object store paths
2016-02-24 11:18:24 -05:00
Nate Coraor
61b59b2082
Security fixes for history imports
2016-02-24 11:18:24 -05:00
Nate Coraor
8c4542b136
Merge branch 'release_15.07' into release_15.10
2016-02-24 11:18:23 -05:00
Nate Coraor
e845d649c6
Security fixes for tool shed hg push and capsule/tarball uploads
2016-02-24 11:18:23 -05:00
Nate Coraor
e4a1d57278
Security fixes for tool shed repository browsing
2016-02-24 11:18:23 -05:00
Nate Coraor
cd8b96553f
Remove sample tracking manual external service transfer due to security concerns
2016-02-24 11:18:23 -05:00
Nate Coraor
5da91bddcd
Security fixes for object store paths
2016-02-24 11:18:23 -05:00
Dave Bouvier