wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
31233 commits 157 branches 562 tags 714 MiB
Commit graph

13023 commits

Author SHA1 Message Date
Morris Jobke
48e03e0c49 Fake LOCK statement for Windows 7, 8 and 10 network mounts 
* fixes #22596
 2016-03-10 15:02:37 +01:00
Thomas Müller
5fc859f7ea Generate birthdays on upgrade from 8.2 as well 2016-03-10 14:17:21 +01:00
Joas Schilling
94915e39db Allow to migrate calendars of all users 2016-03-10 13:42:09 +01:00
Arthur Schiwon
fe2a506e56 remove deprecated ldap_sort 2016-03-10 13:13:38 +01:00
Thomas Müller
b021c8c475 Birthday events are generated on upgrade 2016-03-10 13:04:50 +01:00
Thomas Müller
85521879cd The birthday_calendar is read-only 2016-03-10 12:50:07 +01:00
Thomas Müller
fe7103506b Use a birthday title which does not require translation because we have no idea about the target device language and forcing English upon all users is kind of bad 2016-03-10 12:41:37 +01:00
Thomas Müller
262ec35d50 Merge pull request #23017 from owncloud/first-stop-the-dockers 
docker containers should be stopped before being removed - refs https…
 2016-03-10 10:58:20 +01:00
Thomas Müller
41aae971a9 Merge pull request #23050 from owncloud/href-target-blank 
make sure links open in new tabs
 2016-03-10 10:54:53 +01:00
Joas Schilling
6b4117df34 Correctly escape join statements and use selectAlias 2016-03-10 10:24:08 +01:00
Thomas Müller
6133253a2c fixes #23004 2016-03-10 09:20:53 +01:00
Thomas Müller
845a45ae4a Merge pull request #23064 from owncloud/typo-comments-app-desc 
fix typo in comments app meta data
 2016-03-10 08:24:40 +01:00
Jenkins for ownCloud
96d70aa270 [tx-robot] updated from transifex 2016-03-10 01:55:35 -05:00
Arthur Schiwon
6aefc8fba7 fix typo 2016-03-09 22:31:30 +01:00
Jan-Christoph Borchardt
ecbe4aea31 make sure links open in new tabs 2016-03-09 18:49:46 +01:00
Thomas Müller
bc434b252c fixes #23020 2016-03-09 18:12:39 +01:00
Thomas Müller
822541b689 Merge pull request #23035 from owncloud/fix-syncing-of-all-birthday-calendars 
Fix syncing of all birthday calendars in one go
 2016-03-09 16:44:19 +01:00
Thomas Müller
fe3ffcbfc3 Merge pull request #23026 from stweil/master 
apps/files: Fix typos in comments (found and fixed by codespell)
 2016-03-09 16:43:05 +01:00
Joas Schilling
8c4af74ce7 Fix syncing of all birthday calendars in one go 2016-03-09 16:14:33 +01:00
Lukas Reschke
80b91264e1 Delay check till scanner is used 
Fixes https://github.com/owncloud/core/issues/22973 and https://github.com/owncloud/core/issues/22987
 2016-03-09 16:01:53 +01:00
Stefan Weil
692f312513 apps/files: Fix typos in comments (found and fixed by codespell) 
This contribution is AGPL and MIT licensed.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2016-03-09 15:14:05 +01:00
Thomas Müller
42bcea1ef0 Merge pull request #22986 from owncloud/remove-disabled-autocorrect-new-file 
Remove disabled autocorrect for new file names
 2016-03-09 15:05:32 +01:00
Thomas Müller
cf3cb4d75e docker containers should be stopped before being removed - refs https://github.com/docker/docker/issues/18758 2016-03-09 14:02:08 +01:00
Thomas Müller
290a16e5d7 Merge pull request #22930 from owncloud/bugfix-submit-disable-password-length-zero 
Public link share disabled if password length is equal to 0
 2016-03-09 12:22:01 +01:00
Thomas Müller
447e8d2313 Merge pull request #22961 from owncloud/fix-gdrive-on-php54 
Fix compatibility with PHP 5.4
 2016-03-09 12:20:42 +01:00
Thomas Müller
30cec687ae Merge pull request #22972 from owncloud/use-httpclient-instead-of-file-get-contents 
Use HTTPClient instead of file_get_contents
 2016-03-09 12:20:06 +01:00
Thomas Müller
3608421800 Merge pull request #22974 from owncloud/php-automagics-type-conversion-is-fun 
Use "hasKey" instead of checking the value
 2016-03-09 12:19:45 +01:00
Morris Jobke
52f02fe93e Remove disabled autocorrect for new file names 
* ref #22784
 2016-03-09 08:38:05 +01:00
Jenkins for ownCloud
afe3fdbf49 [tx-robot] updated from transifex 2016-03-09 01:55:42 -05:00
Lukas Reschke
c0200bc5c3 Use "hasKey" instead of checking the value 
If the check is negative it would depending on the used cache store the value as an empty string. When reading the value this check would thus return "false" even if a value exists.
 2016-03-08 23:24:44 +01:00
Lukas Reschke
8214fae9ae Use HTTPClient instead of file_get_contents 
Allows us to catch exceptions like 404's and thus prevents stuff like:

```
{"reqId":"fnmS0hc+fL4+WXKAruo5","remoteAddr":"192.168.39.100","app":"PHP","message":"file_get_contents(http:\/\/ckamm.blaucloud.de\/\/status.php): failed to open stream: HTTP request failed! HTTP\/1.1 404 Not Found\r\n at \/var\/www\/owncloud\/apps\/files_sharing\/lib\/external\/storage.php#260","level":3,"time":"2016-03-08T21:00:33+00:00","method":"PROPFIND","url":"\/remote.php\/webdav\/"}
```
 2016-03-08 22:13:00 +01:00
Lukas Reschke
d14adb2351 Fix compatibility with PHP 5.4 
Fixes https://github.com/owncloud/core/issues/22960
 2016-03-08 18:04:24 +01:00
Vincent Petry
e5a107cc45 Fix share mounting recursion 2016-03-08 14:46:42 +01:00
Thomas Müller
20db92c71a Fix group sharing and sharing permissions - fixes #22932 2016-03-08 11:22:07 +01:00
Thomas Müller
31c89bd3a2 Merge pull request #22885 from owncloud/master-show-version-to-update-to 
Show version to update to properly
 2016-03-08 09:41:52 +01:00
Thomas Müller
2ebf512412 Merge pull request #22915 from owncloud/cleanup_ocs_share_api 
Cleanup OCS Share Api
 2016-03-08 09:41:20 +01:00
Jenkins for ownCloud
a8bafb9bf3 [tx-robot] updated from transifex 2016-03-08 01:55:39 -05:00
prastut
7e52aac771 Public link share disabled if password length is equal to 0 2016-03-08 04:25:35 +05:30
Thomas Müller
0487b541a0 Merge pull request #22880 from owncloud/fix-21656 
improve log output when no LDAP user was found on login attempt
 2016-03-07 17:12:01 +01:00
Roeland Jago Douma
b1dae2a4b9 Can't convert node to string 2016-03-07 16:15:01 +01:00
Roeland Jago Douma
218d042142 Move common code to function 
The code to get a share by id is somewhat messy. And was duplicated.
Now this is done is a separate function
 2016-03-07 16:14:57 +01:00
Thomas Müller
deca1979aa Calendar and addressbook migration commands are always available 2016-03-07 15:04:19 +01:00
Thomas Müller
3b25ccef65 Handle addressbook migration issue by writing the faulty event to the log and continue 2016-03-07 15:04:19 +01:00
Thomas Müller
d32b35fc7f Handle calendar migration issue by writing the faulty event to the log and continue 2016-03-07 15:04:19 +01:00
Thomas Müller
a61fa5b526 Merge pull request #22902 from owncloud/share-archivenamedownloadall 
Fix archive file name when downloading public share
 2016-03-07 14:47:35 +01:00
Thomas Müller
8ef760eb5d Merge pull request #22898 from owncloud/quota-allowuploadwhenfreespaceisunlimited 
Fix uploading to fed share when free space is unlimited
 2016-03-07 14:47:01 +01:00
Thomas Müller
e5b5eca5a9 Merge pull request #22787 from owncloud/versions-fixmtimetooltip 
Fix tooltip for versions mtime
 2016-03-07 14:41:46 +01:00
Thomas Müller
46af7db3e3 Merge pull request #22785 from owncloud/trash-returnfalseon401 
Return false on 401 in file list + trash file list
 2016-03-07 14:41:31 +01:00
Thomas Müller
bd4b61f52b Merge pull request #22896 from owncloud/fix-v1-carddav-endpoint 
Correctly default to null and add type hint
 2016-03-07 13:50:53 +01:00
Thomas Müller
296a46cc38 Merge pull request #22244 from owncloud/dont-update-shared-resource-properties 
For 9.0 we don't have the possibility to store calendar and addressbo…
 2016-03-07 12:42:52 +01:00
Vincent Petry
dbea268332 Remove "files" arg from download URL in public link page 
When no files were specified for download, it means folder download.
In this case, no need to pass an empty "files" argument.
 2016-03-07 11:55:55 +01:00
Vincent Petry
d8e592d670 Fix archive file name when downloading public share 
When download a public link share folder using the button on the top
right, it doesn't provide a list of files.

This fix makes sure to trigger the correct logic when no file list was
given.
 2016-03-07 11:37:49 +01:00
Joas Schilling
c99ae62c33 Correctly default to null and add type hint 2016-03-07 10:48:16 +01:00
Vincent Petry
60d8046c35 Fix uploading when free space is unlimited 
A federated share can report unlimited quota as -3, so the
ajax/upload.php code needs to be adjusted to block uploads when the free
space is unlimited.
 2016-03-07 10:42:36 +01:00
Jenkins for ownCloud
c07b731689 [tx-robot] updated from transifex 2016-03-07 01:56:53 -05:00
Thomas Müller
f2088cafb8 Merge pull request #22859 from owncloud/cache-results-in-memcache-for-is-owncloud 
Cache results of testRemoteUrl
 2016-03-06 20:00:47 +01:00
Thomas Müller
6dcf70f244 Merge pull request #22807 from owncloud/remove-empty-translations 
ne, or_IN, uz and yo have been removed from transifex and will be rem…
 2016-03-06 19:59:57 +01:00
Thomas Müller
6f6d659f56 Merge pull request #22888 from owncloud/use-custom-header 
Use custom header
 2016-03-06 19:53:35 +01:00
Jenkins for ownCloud
05d0d9e9e2 [tx-robot] updated from transifex 2016-03-06 01:55:08 -05:00
Lukas Reschke
4301e30741 Use custom header 
PHP in CGI mode eats the Authorization header => 💣
 2016-03-05 23:04:49 +01:00
Lukas Reschke
4caa9e18b0 Show version to update to properly 
Properly shows the version that will be updated to.
 2016-03-05 21:58:58 +01:00
Jenkins for ownCloud
a98f5c03dc [tx-robot] updated from transifex 2016-03-05 01:56:08 -05:00
Arthur Schiwon
5d3183afcd improve log output when no LDAP user was found on login attempt 2016-03-05 00:18:34 +01:00
C. Montero Luque
b3656f1434 Merge pull request #22878 from owncloud/use-clob-for-timezone 
Use CLOB for timezone
 2016-03-04 18:00:48 -05:00
C. Montero Luque
fe86e0c2f8 Merge pull request #22870 from owncloud/autoenable-federation-app 
Automatically enable "federation" app
 2016-03-04 17:44:50 -05:00
Lukas Reschke
b302ec8381 Use CLOB for timezone 
TEXT defaults to a length of 255 which is going to fail in some cases as the timezone can be rather long.

This changes it back to a CLOB as it has been before as well: 8d8bb68b01. I'm not super convinced that CLOB is the best choice here but at least it seems to work.

Fixes https://github.com/owncloud/core/issues/22876
 2016-03-04 21:59:08 +01:00
C. Montero Luque
89315722a1 Merge branch 'master' into autoenable-federation-app 2016-03-04 13:37:42 -05:00
C. Montero Luque
7a0720f300 Merge branch 'master' into fix-db-locking-cleanup 2016-03-04 13:35:04 -05:00
C. Montero Luque
45f49a090a Merge pull request #22860 from owncloud/trashbin-checkpath 
Properly check path validity before deleting to trash
 2016-03-04 13:33:07 -05:00
Lukas Reschke
1b64982e27 Automatically enable "federation" app 2016-03-04 17:38:51 +01:00
Morris Jobke
138219d74a Run cleanup of expired DB file locks to background job 
* fixes #22819

The old way fired a DELETE statement on each destruction of the
DBLockingProvider. Which could cause a lot of queries. It's enough
to run this every 5 minutes in a background job, which in the end
could result in file locks that exists 5 minutes longer - in the
worst case and for not properly released locks.

This makes the DB based locking a lot more performant and could
result in a similar performance to the Redis based locking provider.
 2016-03-04 15:52:23 +01:00
Thomas Müller
e2642129a1 Merge pull request #22857 from owncloud/add-release-channel-selection 
Add release channel selection back
 2016-03-04 15:29:52 +01:00
Thomas Müller
b56dbd0607 Merge pull request #22816 from owncloud/external-unavailable-recheck 
allow availability recheck for external storages
 2016-03-04 15:29:17 +01:00
Vincent Petry
0eb5292aaf Properly check path validity before deleting to trash 
This prevents deleting the whole "files" folder of the user whenever
$ownerPath is empty. This can happen in concurrency situations.
 2016-03-04 15:27:31 +01:00
Lukas Reschke
63bd6b25db Cache results of testRemoteUrl 
Otherwise setting up the storage will result in a HTTP request and thus slowing down ownCloud.

Replaces https://github.com/owncloud/core/pull/22855
 2016-03-04 15:13:56 +01:00
Lukas Reschke
e3a0a69c73 Add release channel selection back 
Allows to select the release channels again and also shows the last check date
 2016-03-04 14:37:35 +01:00
Thomas Müller
048e11d25f Merge pull request #22830 from owncloud/fix_dav_permissions 
Rename and move permissions are set when a file is updatable
 2016-03-04 12:01:32 +01:00
Vincent Petry
3a36163e91 Fix download spinner to work with CSS styles 
A recent change replaced img elements with CSS icons for file actions.
This fix adjusts the logic to work properly with CSS icons instead of
images.
 2016-03-04 10:48:08 +01:00
Jenkins for ownCloud
bcc200cf9b [tx-robot] updated from transifex 2016-03-04 01:55:53 -05:00
Roeland Jago Douma
3bdafc2122 Rename and move permissions are set when a file is updatable 
* Fix unit tests
 2016-03-03 20:03:06 +01:00
Vincent Petry
4255dd2b39 Properly set exception in FailedStorage 2016-03-03 14:37:23 +01:00
Robin Appelman
6990100e6e allow availability recheck for external storages 2016-03-03 14:19:34 +01:00
Lukas Reschke
72c8187cbb Keep "encryptedVersion" when calling \OC\Files\View::copy 
When calling `\OC\Files\View::copy` we should also keep the version to ensure that the file will always have the correct version attached and can be successfully decrypted.

To test this the following steps are necessary (from https://github.com/owncloud/core/issues/22781#issuecomment-191328982):

1. setup a new ownCloud 9.0 beta2
2. enable encryption
2. upload a docx (5.7MB large)
3. upload the same file again and overwrite the existing file
4. I can download the original file and the first version
5. I restore the first version
6. restored version can no longer be downloaded with the error described above

The manual cache operation in `\OCA\Files_Versions\Storage` is unfortunately necessary since `\OCA\Files_Versions\Storage::copyFileContents` is not using `\OCP\Files\Storage::moveFromStorage` in the case when an object storage is used. Due to the workaround added in 54cea05271 the stream is directly copied and thus bypassing the FS.
 2016-03-03 14:15:36 +01:00
Bjoern Schiessle
b6050b44c2 disable the recovery key if the master key is enabled 2016-03-03 12:16:39 +01:00
Thomas Müller
4f25f34178 Merge pull request #22778 from owncloud/fix-22770 
untangle different user manager instances, fixes #22770
 2016-03-03 11:55:10 +01:00
Thomas Müller
c590372aef Merge pull request #22784 from owncloud/files-newmenu-removebrowsercomplete 
Remove browser autocomplete in new file menu
 2016-03-03 11:54:48 +01:00
Thomas Müller
8cacfce83d ne, or_IN, uz and yo have been removed from transifex and will be removed from git here now as well 2016-03-03 11:29:57 +01:00
Vincent Petry
dbdf2173ac Return false on 401 in file list + trash file list 
This gives a chance to the global ajax error handler to do its work if
the session expired.
 2016-03-03 09:09:30 +01:00
Jenkins for ownCloud
8b76e8c57b [tx-robot] updated from transifex 2016-03-03 01:56:04 -05:00
Vincent Petry
03b90cec35 Fix tooltip for versions mtime 
It was missing a call to jquery.tooltip
 2016-03-02 17:50:46 +01:00
Vincent Petry
5676216e56 Remove browser autocomplete in new file menu 2016-03-02 17:10:29 +01:00
Arthur Schiwon
82b55c4db9 untangle different user manager instances, fixes #22770 2016-03-02 13:02:43 +01:00
Joas Schilling
1b3e7ae82b Translate strings of federation admin section 2016-03-02 12:54:53 +01:00
Joas Schilling
8885cb1eb9 Increase all versions on master which is now 9.1 2016-03-02 08:53:42 +01:00
Jenkins for ownCloud
702c1a8962 [tx-robot] updated from transifex 2016-03-02 01:56:33 -05:00
C. Montero Luque
4d69e562a0 Merge pull request #22757 from owncloud/apply-license 
Update copyright information and author file
 2016-03-01 15:36:37 -05:00
C. Montero Luque
5a2fe4107c Merge branch 'master' into part-file-root 2016-03-01 13:35:04 -05:00
C. Montero Luque
745fdc4800 Merge pull request #22742 from owncloud/ceph-keystone-readiness 
Use readiness notification socket to be absolutely sure this works
 2016-03-01 13:34:23 -05:00
Lukas Reschke
3067367ff3 Add new apps 2016-03-01 17:52:32 +01:00
Lukas Reschke
c353d51810 Remove Scrutinizer Auto Fixer 2016-03-01 17:48:23 +01:00
Lukas Reschke
c430f5ba53 Map Maci 2016-03-01 17:45:05 +01:00
Lukas Reschke
933f60e314 Update author information 
Probably nice for the people that contributed to 9.0 to see themselves in the AUTHORS file :)
 2016-03-01 17:25:15 +01:00
Robin Appelman
37f1206818 allow putting the part file in the view root 2016-03-01 15:21:24 +01:00
Thomas Müller
900dcf6594 Merge pull request #22699 from owncloud/checksum_int_test 
Checksum intergration tests and fixes
 2016-03-01 14:47:09 +01:00
Thomas Müller
a83af96dd3 Merge pull request #22686 from owncloud/cleanup_remote_address_books 
remove remote address book if access was revoked
 2016-03-01 14:46:51 +01:00
Vincent Petry
57babe032b Save some calls to refreshInfo during upload 2016-03-01 11:44:49 +01:00
Roeland Jago Douma
ac392457f2 Fix unit tests 2016-03-01 11:37:16 +01:00
Roeland Jago Douma
ec140fa2ec Checksums on chunked files 
We should also store checksums on chunked files.
We do not checksum individual chunks but only the final file.
 2016-03-01 11:37:16 +01:00
Roeland Jago Douma
3e88a5067f Remove checksum on upload of non checksumed file 
When we overwrite a checksumed file with a file without a checksum we
should remove the checksum from the server.

This is done by setting the column to empty.
 2016-03-01 11:37:16 +01:00
Thomas Müller
5fe5233f41 Merge pull request #22681 from owncloud/add-autodiscovery-for-ocs 
Add autodiscovery support to server-to-server sharing implementation
 2016-03-01 11:27:28 +01:00
Thomas Müller
73e145cf63 Merge pull request #22728 from owncloud/external-share-testremote 
use ocs discover endpoint to test remote
 2016-03-01 11:27:07 +01:00
Bjoern Schiessle
1832bd0fa1 increase version number 2016-03-01 11:21:24 +01:00
Thomas Müller
a66899c528 Handle null case 2016-03-01 10:41:05 +01:00
Thomas Müller
1652541150 Merge pull request #22700 from owncloud/only_1_linkshare 
For now only allow 1 link share per file/folder
 2016-03-01 09:22:39 +01:00
Thomas Müller
25a4571dcd Merge pull request #22731 from owncloud/hide-nodes-from-listening 
Hides nodes from listing that the user has no access to
 2016-03-01 09:22:08 +01:00
Thomas Müller
fd4742d430 Merge pull request #22613 from owncloud/quota-changedavreturnvaluewhennoquotaset 
Don't return quota when none set
 2016-03-01 08:30:58 +01:00
Roeland Jago Douma
ffce4fc6a9 For now only allow 1 link share per file/folder 
Fixes #22692
This is a temp fix util we get #22327

We just block it in the OCS Share API since we have 1 endpoint now
anyway.
 2016-03-01 08:25:40 +01:00
Thomas Müller
eb740d1dac Merge pull request #22727 from owncloud/decrypt_all_master_key 
make decrypt all work with the master key
 2016-03-01 08:23:27 +01:00
Thomas Müller
f3050b3adb Merge pull request #22740 from owncloud/fix_resare_updates 
Check correct permissions when resharing
 2016-03-01 08:17:56 +01:00
Jenkins for ownCloud
a06f59c580 [tx-robot] updated from transifex 2016-03-01 01:55:33 -05:00
Thomas Müller
3adb6ae0f5 Merge pull request #22707 from owncloud/use-our-public-api 
Use IQueryBuilder::PARAM_* instead of \PDO::PARAM_*
 2016-03-01 07:24:57 +01:00
Lukas Reschke
9ca1e9c7e9 Only use scanner if remote is an ownCloud 2016-03-01 07:01:52 +01:00
Lukas Reschke
e965dcaebf /shareinfo is not required 2016-03-01 07:01:52 +01:00
Lukas Reschke
8f95d69954 Fix tests 2016-03-01 07:01:52 +01:00
Lukas Reschke
74e47da883 Add missing trailing slash 2016-03-01 07:01:51 +01:00
Robin Appelman
080a62231e use ocs discover endpoint to test remote 2016-03-01 07:01:51 +01:00
Lukas Reschke
88fc5149ed Fix Scrutinizer issues 2016-02-29 22:44:40 +01:00
Robin McCorkell
078cc3b3f0 Use readiness notification socket to be absolutely sure this works 2016-02-29 21:20:11 +00:00
Lukas Reschke
d04edfaf0d Hides nodes from listing that the user has no access to 2016-02-29 20:53:38 +01:00
Roeland Jago Douma
8924b0a0dc Check correct permissions when resharing 
Fixes #22675

Since we only get a share id we do not know the path for the sharer.
Now if we edit a share we start searching for shares for that user of
that node. And deduce the permissions that way.

* Intergration test added
* Fix unit tests
 2016-02-29 19:30:14 +01:00
Joas Schilling
7a46b30c94 Allow to change properties of readonly calendars 2016-02-29 17:17:57 +01:00
Bjoern Schiessle
9e9cb73987 fix doc-block 2016-02-29 16:50:34 +01:00
Bjoern Schiessle
87e47afed8 remove synced remote address book if the remote server revoked access to his system address book 2016-02-29 16:50:34 +01:00
Bjoern Schiessle
7189c72c33 remove remote address book if the admin removes the server from the trusted servers list 2016-02-29 16:50:33 +01:00
Joas Schilling
6f22784d3d Allow to hide a shared calendar 2016-02-29 16:49:55 +01:00
Thomas Müller
95e218b00c For 9.0 we don't have the possibility to store calendar and addressbook properties on a per-user basis and therefore we simple don't allow this for now 2016-02-29 16:49:55 +01:00
Thomas Müller
52d217d775 Merge pull request #22623 from owncloud/docker-logs-on-swift-external 
Print docker logs to the console fro debugging
 2016-02-29 16:36:34 +01:00
Bjoern Schiessle
95ea2ccb53 make decrypt all work with the master key 2016-02-29 14:54:32 +01:00
Vincent Petry
11215f4e27 Return -3 for unlimited quota 
Returns -3 for unlimited quota in Webdav response.
Also adjusted personal page to show unlimited quota when set.
 2016-02-29 14:36:20 +01:00
Thomas Müller
a38e8b6436 Merge pull request #22662 from owncloud/comments-count 
remove comments count because it is not that relevant to show directly
 2016-02-29 13:44:56 +01:00
Joas Schilling
2a0cda74d4 Use IQueryBuilder::PARAM_* instead of \PDO::PARAM_* 2016-02-29 09:44:40 +01:00
Jenkins for ownCloud
5800585039 [tx-robot] updated from transifex 2016-02-29 01:55:04 -05:00
Jenkins for ownCloud
a39332832c [tx-robot] updated from transifex 2016-02-28 01:55:12 -05:00
Jenkins for ownCloud
f9826ec948 [tx-robot] updated from transifex 2016-02-27 01:56:08 -05:00
Bjoern Schiessle
eccd7cf654 reuse the url_hash instead of calculating a new hash for the address book 2016-02-26 20:00:13 +01:00
Thomas Müller
e9237dd83c Merge pull request #22671 from owncloud/issue-22670 
Move the tag filter at the end for now
 2016-02-26 10:48:55 +01:00
Thomas Müller
66536f912e Merge pull request #22640 from owncloud/fix_22587 
Remove delete permissions for read-only federated reshares
 2016-02-26 10:48:07 +01:00
Thomas Müller
c6c15ba825 Merge pull request #22608 from owncloud/collaborative-tags 
Rename system tags app to collaborative tags
 2016-02-26 10:47:40 +01:00
Thomas Müller
96f15a12a9 Merge pull request #22461 from owncloud/fix_6773 
Allow theming of actions
 2016-02-26 10:47:20 +01:00
Joas Schilling
4549b82553 Move the tag filter at the end for now 2016-02-26 10:15:07 +01:00