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

27056 commits

This branch
This branch
All branches
Author SHA1 Message Date
Georg Ehrke
b3ff773bbf delete cached preview when rolling back file's version 
add random number using OC.parseQueryString and _.extend()

version rollback: add missing prefix to OC\Preview::post_delete

add test to assure that the rollback hook is called
 2015-09-20 11:22:40 +02:00
Jenkins for ownCloud
bbd1e99605 [tx-robot] updated from transifex 2015-09-20 01:54:48 -04:00
Jenkins for ownCloud
c433d48d8e [tx-robot] updated from transifex 2015-09-19 01:55:22 -04:00
C Montero-Luque
9d1885a535 8.2 beta1 2015-09-18 14:01:46 -04:00
Thomas Müller
08ae1e8183 Merge pull request #19008 from owncloud/jquery_avatar_tests 
JS tests for jquery.avatar
 2015-09-18 17:31:18 +02:00
Thomas Müller
9dc136a0d0 Merge pull request #19028 from owncloud/McNetic-zipstreamer-0.7 
[jenkins] changed ZipStreamer to use composer for updates, update to 0.7
 2015-09-18 17:03:49 +02:00
Thomas Müller
bbf128f1b2 Merge pull request #19098 from owncloud/db-lock-no-transaction 
Remove the need for the transaction in the database locking backend
 2015-09-18 17:02:18 +02:00
Thomas Müller
3325fb4cdd Merge pull request #19058 from owncloud/multiselect-bar-style 
adjust multiselect bar to controls bar, fix #18989
 2015-09-18 15:52:05 +02:00
Thomas Müller
d62cffbc9a Merge pull request #18901 from owncloud/encryption-dav-tests 
Add tests for doing dav requests with encryption enabled
 2015-09-18 14:54:06 +02:00
Thomas Müller
eb41a4da7f Merge branch 'zipstreamer-0.7' of https://github.com/McNetic/owncloud_core into McNetic-zipstreamer-0.7 2015-09-18 14:43:37 +02:00
Thomas Müller
101fe59ce2 Merge pull request #17689 from owncloud/repair-ocs-ids 
Add repair step for outdated OCS IDs
 2015-09-18 13:42:51 +02:00
Nicolai Ehemann
5db186e77c adapted to changed subproject commit 2015-09-18 13:42:36 +02:00
Lukas Reschke
7c6d811584 Prefer OCS Id from database 
To be consistent with other logic the app id from the database needs to be prefered. Especially when it comes to be able to replace an outdated OCS id.
 2015-09-18 13:27:26 +02:00
Lukas Reschke
947e3d7ab5 Add repair step for outdated OCS IDs 
There is the case where OCs IDs might become outdated such as it has been with the calendar and contacts app which refer to the old dummy entry. This means that users with the old OCS id can't update updates as well will receive invalid state flags. (e.g. "experimental" instead of "approved")

To allow instances to properly update the applications in the future we need to migrate the OCS IDs for now manually.
 2015-09-18 13:27:26 +02:00
Thomas Müller
188d6d2e28 Merge pull request #18911 from owncloud/preview-show-cached-directly 
Show cached previews directly
 2015-09-18 13:02:10 +02:00
Thomas Müller
0101b1c65f Merge pull request #18840 from owncloud/fix-app-disable-route 
Rebuild app navigation in JS
 2015-09-18 13:00:58 +02:00
Thomas Müller
a4a5c9dafd Merge pull request #18943 from owncloud/trashbin-expiration-cronjob-no-db 
Add Trashbin expiration cronjob
 2015-09-18 12:01:23 +02:00
Thomas Müller
b59c42e5df Merge pull request #18983 from owncloud/fix_18926 
check for the right user if we can change his password
 2015-09-18 11:59:57 +02:00
Thomas Müller
75425b28df Merge pull request #18679 from owncloud/add-reshare-activities 
Add reshare activities for the parent sharee and the original file owner
 2015-09-18 11:59:30 +02:00
Thomas Müller
93eb73b0bb Merge pull request #18986 from owncloud/federated_capabilities 
Expose federated sharing capabilities to authenticated users
 2015-09-18 11:58:54 +02:00
Thomas Müller
0c37a28a60 Merge pull request #19087 from owncloud/disable-remote-share-notifications-for-now 
Disable remote share notifications for now
 2015-09-18 11:58:20 +02:00
Thomas Müller
0eb37e2d64 Merge pull request #19092 from owncloud/allow-checking-for-notifiers 
Allow checking whether there are notifiers registered
 2015-09-18 11:57:56 +02:00
Thomas Müller
3ca61db63b Merge pull request #19017 from owncloud/dav-download-tests 
Add tests for downloading files over dav
 2015-09-18 11:57:28 +02:00
Robin Appelman
485ea316a1 reuse the same datadir 2015-09-18 11:55:15 +02:00
Robin Appelman
dc870cb450 Add tests for doing dav requests with encryption enabled 2015-09-18 11:55:15 +02:00
Robin Appelman
a3d734f6cd Add trait to enable encryption for a unit test 2015-09-18 11:55:15 +02:00
Robin Appelman
e3e78f809d create new mounts every time the mount provider is called 
important for storage wrappers
 2015-09-18 11:55:15 +02:00
Robin Appelman
5247a0685d clear up tests a bit 2015-09-18 11:55:15 +02:00
Thomas Müller
8fa4ebaf6d Merge pull request #18724 from owncloud/expiration-cronjob 
Versions expiration cronjob
 2015-09-18 11:11:47 +02:00
Thomas Müller
e37ee9a814 Merge pull request #19069 from owncloud/ext-s3-ceph 
AmazonS3 automatic tests
 2015-09-18 11:11:05 +02:00
Thomas Müller
2eeb1b2b79 Merge pull request #19088 from owncloud/fix-availability-int 
Explicitly cast number to integer
 2015-09-18 08:31:56 +02:00
Thomas Müller
100d9e1976 Merge pull request #19095 from owncloud/set-priority-to-1-for-maintenance 
Make sure Maintenance is checked before auth and others
 2015-09-18 08:17:58 +02:00
Thomas Müller
a6ab106b9a Merge pull request #19126 from owncloud/fix-19117 
Fix missing checkboxes in share dialog
 2015-09-18 08:17:19 +02:00
Jenkins for ownCloud
2b21c80335 [tx-robot] updated from transifex 2015-09-18 01:54:55 -04:00
Thomas Müller
9803d68e55 Merge pull request #19090 from owncloud/ext-priority-logic 
Properly implement external mount priorities
 2015-09-17 18:11:53 +02:00
Thomas Müller
c18156a4fe Merge pull request #19121 from owncloud/sidebar-design-details 
fix Files sidebar layout of Versions and Sharing
 2015-09-17 18:03:56 +02:00
Thomas Müller
c74da41faf Merge pull request #19123 from owncloud/listener-sabre-plugin 
Add a Sabre plugin that emits an event
 2015-09-17 18:03:15 +02:00
Hendrik Leppelsack
7c80c8e484 fix missing checkboxes in share dialog 2015-09-17 16:25:10 +02:00
Thomas Müller
d56e76c869 Merge pull request #19131 from owncloud/versionsphp-php53 
Make version.php PHP 5.3 compatible for the build scripts
 2015-09-17 16:16:04 +02:00
Vincent Petry
180ad9e7df Make version.php PHP 5.3 compatible for the build scripts 2015-09-17 15:50:37 +02:00
Joas Schilling
44e6c4f398 Do not "use" Server 2015-09-17 15:11:05 +02:00
Robin Appelman
e9b1aa6037 improve doc 2015-09-17 14:09:28 +02:00
Joas Schilling
5eddde6486 Add a Sabre plugin that emits an event for apps 2015-09-17 13:59:27 +02:00
Robin Appelman
05fddec022 expire old lock rows 2015-09-17 13:55:04 +02:00
Jan-Christoph Borchardt
3eeea852b3 fix sidebar Sharing layout a bit 2015-09-17 13:18:03 +02:00
Jan-Christoph Borchardt
de1bc0b653 fix sidebar Versions layout 2015-09-17 13:15:45 +02:00
Thomas Müller
4cff2f1ab3 Merge pull request #19046 from owncloud/issue-18924-throw-error-on-invalid-page 
Throw an error when the page count or perPage setting is invalid
 2015-09-17 13:02:14 +02:00
Joas Schilling
6bc93c7401 Disable the remote sharing notifications until they work properly 2015-09-17 11:14:28 +02:00
Joas Schilling
9e1cd6d873 Change the order of the buttons 2015-09-17 11:14:27 +02:00
Joas Schilling
c3420fface Allow checking whether there are notifiers registered 2015-09-17 11:08:17 +02:00