Commit Graph

28169 Commits

Author SHA1 Message Date
Thomas Müller d7efb6d8b5 Merge pull request #20152 from owncloud/LukasReschke-patch-1
Remove invalid type-cast
2015-10-29 16:44:31 +01:00
Robin Appelman 860e31a333 dont trigger the scroll event of every single item we filter in the file list 2015-10-29 16:30:56 +01:00
Thomas Müller 774d069ff0 Merge pull request #20122 from owncloud/files-consolidateiconupdate
Fix icon update to be more consistent
2015-10-29 15:40:15 +01:00
Lukas Reschke a6f180f24e Remove invalid type-cast
This is an `is_array` operation and not a `in_array` one. Thus this typecast is not required.

Fixes https://github.com/owncloud/core/issues/20095
2015-10-29 15:19:02 +01:00
Lukas Reschke e3acc1243b Revert "Specify PHP 5.4 as version for scrutinizer" 2015-10-29 14:30:14 +01:00
Thomas Müller 1ce911d2f9 Merge pull request #19592 from owncloud/availability-root-always-exists
The root of a storage always exists
2015-10-29 14:14:56 +01:00
Thomas Müller b840fc7c58 Merge pull request #20134 from owncloud/pass-with-skipping
Make Travis CI pass when DAV was not touched
2015-10-29 14:14:36 +01:00
Thomas Müller 054d4aeb89 Merge pull request #20141 from owncloud/checkboxes-settings-users
Apply new checkbox style in users settings
2015-10-29 14:14:15 +01:00
Hendrik Leppelsack d2f0055af4 apply new checkbox style in users settings 2015-10-29 13:03:55 +01:00
Vincent Petry 9c9158e6b7 Fix icon update to be more consistent
Makes the details bar show the same icon as in the list.
2015-10-29 12:59:51 +01:00
Thomas Müller 675c6963ba Merge pull request #20144 from owncloud/gitignore-clover.xml
ignore any clover.xml - which is generated by some phpunit calls
2015-10-29 12:35:38 +01:00
Robin Appelman 01d3393b7b include the final update in the transaction when moving a folder in the cache 2015-10-29 12:34:49 +01:00
Thomas Müller c35c498315 ignore any clover.xml - which is generated by some phpunit calls 2015-10-29 12:21:23 +01:00
Thomas Müller 530f7229e7 Merge pull request #19869 from owncloud/cache-adjustcurrentmtimeonrename
On rename, also refresh storage_mtime of the target file
2015-10-29 11:57:00 +01:00
Lukas Reschke c6f6a8758b Drop OC_SubAdmin and replace usages 2015-10-29 11:31:18 +01:00
Thomas Müller 9ab44f1f00 Merge pull request #11509 from owncloud/internal_email_template
Allow separate templates for internal and external share notifications
2015-10-29 11:27:05 +01:00
Thomas Müller 7d96f82659 Merge pull request #19000 from UoM-ResPlat-DevOps/swift-squelch-expected-404-errors
Don't log expected Swift 404 responses in files_external
2015-10-29 11:26:24 +01:00
Thomas Müller 911613f711 Merge pull request #19100 from owncloud/ext-tooltip-unavailable
Display external storage status as tooltip
2015-10-29 11:25:52 +01:00
Thomas Müller c7f409713e Merge pull request #20140 from owncloud/provisioning_killappphp
Kill empty app.php in provisioning_api
2015-10-29 11:25:26 +01:00
Robin Appelman 33eb13e415 The root of a storage always exists 2015-10-29 11:21:50 +01:00
Joas Schilling 16e3f4de07 Kill empty app.php in provisioning_api 2015-10-29 11:08:39 +01:00
Thomas Müller f000edb636 Merge pull request #19871 from owncloud/issue-19583-invalid-shares
Issue 19583 invalid shares
2015-10-29 10:43:50 +01:00
Thomas Müller 3dade2db77 Merge pull request #20120 from owncloud/sharee-list-view-tests
Add sharee list view js tests
2015-10-29 10:43:04 +01:00
Stephen Colebrook 6feb31bf96 Allow separate templates for internal and external share notifications 2015-10-29 10:24:24 +01:00
Joas Schilling 9d35cacfda Make Travis CI pass when DAV was not touched 2015-10-29 10:14:45 +01:00
Thomas Müller f428d31a5d Merge pull request #20126 from owncloud/LukasReschke-patch-1
Update certificate bundle
2015-10-29 10:04:14 +01:00
Joas Schilling 6043f0afdb Use the method 2015-10-29 09:26:26 +01:00
Joas Schilling e5a7e3124a Add a repair step that checks for group membership on shares 2015-10-29 09:26:26 +01:00
Joas Schilling ca2fd30073 Remove shares where the parent does not exist anymore 2015-10-29 09:26:26 +01:00
Thomas Müller 5bf476efd0 Merge pull request #20079 from owncloud/filelist-invalidpath
Fix file list reload callback result
2015-10-29 09:21:30 +01:00
Tom Needham 628e4a9daf Add sharee list view js tests 2015-10-29 09:01:47 +01:00
Jenkins for ownCloud 527ef76dd6 [tx-robot] updated from transifex 2015-10-29 01:55:45 -04:00
Lukas Reschke 834d1ab05e Fix format 2015-10-29 00:34:23 +01:00
Lukas Reschke 983dfebb5d Update certificate bundle
Syncs with ca-certificates version 2.5.

- Removes expired TURKTRUST Certificate Services Provider Root 1 (https://bugzilla.mozilla.org/show_bug.cgi?id=1165992)
- Removes obsolete TC TrustCenter certificates (https://bugzilla.mozilla.org/show_bug.cgi?id=1159070)
- Removes ComSign Secured certificate as it is not used for websites (https://bugzilla.mozilla.org/show_bug.cgi?id=1160208)
- Adds updated TURKTRUST certificates as the old ones are expired (https://hg.mozilla.org/integration/mozilla-inbound/rev/2f1a37cb43ac)
- Add Certinomis as root certificate (https://bugzilla.mozilla.org/show_bug.cgi?id=1169083)
2015-10-29 00:32:55 +01:00
Thomas Müller 92e63a802c Merge pull request #19758 from owncloud/ext-fallback-getmimetype
Fallback to default mimetype detection mechanism
2015-10-28 14:50:19 +01:00
Thomas Müller 8ad3df9b9e Merge pull request #19182 from cweiske/support-bzip2
Fix #19181: Support .bz2 app archives
2015-10-28 14:05:11 +01:00
Thomas Müller 17f83b17b9 Merge pull request #20108 from owncloud/initially_load_250_users
Initially load 250 users
2015-10-28 13:45:05 +01:00
Jörn Friedrich Dreyer 69417e3654 Initially load at least 250 users 2015-10-28 11:55:16 +01:00
Thomas Müller e54c22eb59 Merge pull request #20089 from owncloud/litmus-test-webdav
Enable DAV app testing on travis
2015-10-28 11:09:12 +01:00
Thomas Müller 49e30abc82 Merge pull request #20102 from owncloud/fix_subadmin
Make \OC\SubAdmin php-5.4 compatible
2015-10-28 10:51:38 +01:00
Thomas Müller 09fff15021 run litmus scripts only if code in the dav app did change changed 2015-10-28 09:59:09 +01:00
Thomas Müller 0eeee8fdd8 Merge pull request #20093 from owncloud/ldap-fix-quota-and-case
LDAP fix quota and case, fixes #20043
2015-10-28 09:31:04 +01:00
Thomas Müller f8012fd734 Merge pull request #20097 from owncloud/revert-19508
Revert "setting to skip migration tests by default"
2015-10-28 09:19:53 +01:00
Roeland Jago Douma 07fe1df8c1 Make \OC\SubAdmin php-5.4 compatible
* Also close some cursors while we are at it
2015-10-28 09:09:16 +01:00
Jenkins for ownCloud d74811fcc8 [tx-robot] updated from transifex 2015-10-28 01:55:29 -04:00
Thomas Müller b753e7631b Enable DAV app testing on travis 2015-10-27 23:00:04 +01:00
Morris Jobke 3b249f1967 Revert "setting to skip migration tests by default"
This reverts commit 7cbdd9b90b.
2015-10-27 21:25:11 +01:00
Thomas Müller 588a668455 Merge pull request #20082 from owncloud/phil-davis-sharedialogviewspec-typos
sharedialogviewSpec.js couple of text typos
2015-10-27 20:04:05 +01:00
Arthur Schiwon f96e552164 fix attribute casing to ensure array keys work 2015-10-27 19:10:38 +01:00
Arthur Schiwon e1d61284f8 fix update quota with known value 2015-10-27 18:07:40 +01:00