2c8eaacec7
Merge headers of ocs results
2015-09-21 11:54:46 +02:00
6006a03ef1
Merge pull request #19122 from owncloud/discardexpirationdatefornonlinkshares
...
Discard expiration date from result for non-link shares
2015-09-21 11:47:37 +02:00
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
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
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
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
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
188d6d2e28
Merge pull request #18911 from owncloud/preview-show-cached-directly
...
Show cached previews directly
2015-09-18 13:02:10 +02:00
0101b1c65f
Merge pull request #18840 from owncloud/fix-app-disable-route
...
Rebuild app navigation in JS
2015-09-18 13:00:58 +02:00
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
2eeb1b2b79
Merge pull request #19088 from owncloud/fix-availability-int
...
Explicitly cast number to integer
2015-09-18 08:31:56 +02:00
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
44e6c4f398
Do not "use" Server
2015-09-17 15:11:05 +02:00
e9b1aa6037
improve doc
2015-09-17 14:09:28 +02:00
5eddde6486
Add a Sabre plugin that emits an event for apps
2015-09-17 13:59:27 +02:00
05fddec022
expire old lock rows
2015-09-17 13:55:04 +02:00
1911472b88
Discard expiration date from result for non-link shares
2015-09-17 13:45:26 +02:00
c3420fface
Allow checking whether there are notifiers registered
2015-09-17 11:08:17 +02:00
7c66328381
Remove the need for the transaction in the database locking backend
2015-09-17 11:07:59 +02:00
bc89bca803
Make sure Maintenance is checked before auth and others
2015-09-17 11:06:51 +02:00
91365a8969
[tx-robot] updated from transifex
2015-09-17 01:57:20 -04:00
0155bcf278
[tx-robot] updated from transifex
2015-09-17 01:55:25 -04:00
a1e343ae7c
Merge pull request #19086 from owncloud/restore-loadapp-autoload
...
Restore loadApp() autoload registration
2015-09-16 15:19:41 +02:00
b0414f6a30
Merge pull request #19022 from owncloud/console-loader-validroot
...
Register valid root for all installed apps in console
2015-09-16 15:17:43 +02:00
a0094d28f1
Explicitly cast number to integer
2015-09-16 11:22:52 +01:00
862afd80b3
Restore loadApp() autoload registration
...
Also changes the autoloader validRoots into a hashmap to try and reduce
duplicate entries
2015-09-16 10:48:03 +01:00
ed872589a3
Merge pull request #19077 from owncloud/check-maintenance-before-everything-else-master
...
Check for maintenance mode first so we send the 503 instead of login…
2015-09-16 10:22:10 +02:00
e0992c1297
Check for maintenance mode first so we send the 503 instead of login verification
2015-09-16 09:38:36 +02:00
c17d022ca4
started to implement sharee list view. not completed yet, do not cry please.
2015-09-16 07:23:27 +02:00
ffd4e0dc5a
split off expirationView
2015-09-16 07:23:26 +02:00
f9c232c4ce
split off linkShareView
2015-09-16 07:23:26 +02:00
dcb084a617
split ShareDialogResharerInfoView from base view
2015-09-16 07:23:26 +02:00
83d91ddf20
further work on reimplementing the dialog layout
2015-09-16 07:23:25 +02:00
edd163a611
refactor share dialog for multi-purpose use (dropdown, sidebar) and better maintainability
2015-09-16 07:23:25 +02:00
9bd4f2d41e
occ script to disable encryption and to decrypt all files again
2015-09-15 22:39:44 +02:00
9883d5b85d
Merge pull request #18915 from owncloud/node-getfoldercontents-use-view-logic
...
Use the view logic for getFolderContent for the node api
2015-09-15 18:04:01 +02:00
e545c2eec5
Merge pull request #17811 from owncloud/dav-lock-wide
...
Wrap the entire dav PUT in a read lock
2015-09-15 17:22:00 +02:00
ae9ea244f2
Merge pull request #19043 from owncloud/fix-php-doc-of-encrypt-all
...
Function does return void
2015-09-15 17:03:34 +02:00
decdaf0018
Merge pull request #19024 from owncloud/remove-get_temp_dir
...
Remove get_temp_dir()
2015-09-15 14:18:29 +02:00
7953cc9494
Function does return void
...
This function does return void and not a bool.
2015-09-15 14:02:10 +02:00
e82a225d04
Merge pull request #18964 from owncloud/availability-integer
...
Use integer for availability instead of bool
2015-09-15 13:24:55 +02:00
8e1b403b16
Catch apps which have been removed manually
2015-09-15 12:10:23 +02:00
4680691ca6
Define allowed app roots earlier
...
The autoloader needs to be run before including the app.php, otherwise it depends on what app gets executed first and apps that rely on the dependency of other apps in app.php may break.
2015-09-15 12:10:23 +02:00
f8619870ea
Remove get_temp_dir()
2015-09-15 11:33:25 +02:00
65ebba44ce
Allow /tests folder in autoloader by default
...
Given the fact that "/tests" is not shipped by default and this has broken some applications and frustrated quite some people we should add "/tests" to the default allowed autoloading set.
I do consider the security impact marginally since the /tests folder is not shipped within the release as well as usually has a hard requirement on being called by phpunit.
2015-09-15 11:32:07 +02:00
5ca690e2f8
Use integer for availability instead of bool
2015-09-15 10:18:32 +02:00
35d4851af2
Merge branch 'master' into fix-app-disable-route
2015-09-14 19:50:52 +01:00
688981b55c
allow hook cancel
2015-09-14 20:35:33 +02:00
75f126da49
use the correct path for cache updates when doing chunked assembly
2015-09-14 20:35:33 +02:00
6386327150
work directly on storages when doing a chunked upload assembly
2015-09-14 20:35:33 +02:00
Thomas Müller
Lukas Reschke
Joas Schilling
Robin Appelman
Vincent Petry
Jenkins for ownCloud
Robin McCorkell
Arthur Schiwon
Bjoern Schiessle
Robin Appelman