Morris Jobke
3e97ca3b96
Add getUserFolder to IRootFolder
...
* untangle DI of user specific folders
* allows to autodetect the dependency
2015-07-03 11:11:58 +02:00
Vincent Petry
f70791653c
Merge pull request #17291 from owncloud/mount-manager-public
...
expose the mount manager in the public api
2015-07-03 07:57:31 +02:00
Jenkins for ownCloud
b8f5b2c47a
[tx-robot] updated from transifex
2015-07-03 01:54:57 -04:00
Morris Jobke
fd8f6a18fd
Merge pull request #17327 from owncloud/fix_index
...
owner is stored as 'uid_owner', not as 'owner' in the oc_share table
2015-07-02 23:26:28 +02:00
Lukas Reschke
ded2b2b690
Merge pull request #17353 from owncloud/apps-keepgloballist
...
Fix global app list state
2015-07-02 20:00:56 +02:00
Morris Jobke
a3df41ddb6
Merge pull request #17159 from owncloud/fix-duplicate-id
...
remove duplicate ID in HTML template for public shares
2015-07-02 17:50:39 +02:00
Morris Jobke
99f9f7c3c4
Merge pull request #17343 from owncloud/share-disablepluginwhennocoreshare
...
Do not register JS share plugin if core sharing API is disabled
2015-07-02 17:26:43 +02:00
Vincent Petry
d5b7e40c19
Unit test for app list
2015-07-02 17:22:56 +02:00
Vincent Petry
2f6dc8743e
Fix global app list state
2015-07-02 17:15:14 +02:00
Bjoern Schiessle
f5a7aa2968
call post_addToGroup als for class OC_User because sharing and LDAP are using this class. Minimal approach to fix #16740
2015-07-02 16:25:11 +02:00
Vincent Petry
e65034e4bc
Do not register JS share plugin if core sharing API is disabled
2015-07-02 14:56:33 +02:00
Thomas Müller
063071b58d
Merge pull request #17328 from owncloud/revert-15363-ext-ocp
...
Revert "Use OCP classes as much as possible in files_external"
2015-07-02 13:02:35 +02:00
Morris Jobke
f5c57e076e
Merge pull request #17077 from owncloud/files-scan-absolute-path
...
fix getting mount points when passing a path to the files:scan command
2015-07-02 13:02:20 +02:00
Vincent Petry
aedf4848f7
Merge pull request #17324 from owncloud/fix-duplicated-line-in-doc-block
...
Fix duplicated line in doc block
2015-07-02 13:00:22 +02:00
Thomas Müller
079e9cecba
Revert "Use OCP classes as much as possible in files_external"
2015-07-02 13:00:21 +02:00
Morris Jobke
73c20ec189
Merge pull request #17321 from rullzer/3rdparty-doctering-v1.2.6
...
Upgrade 3rdparty submodule for docterine v1.2.6
2015-07-02 12:55:28 +02:00
Joas Schilling
c7968d202f
Merge pull request #17316 from owncloud/master-delete-ocsid-from-db-if-none-specified
...
[Master] Delete OCS ID from DB if none is specified
2015-07-02 12:37:31 +02:00
Bjoern Schiessle
f52eec765c
owner is stored as 'uid_owner', not as 'owner' in the oc_share table
2015-07-02 10:49:22 +02:00
Joas Schilling
bfcb8ffeb3
Merge pull request #17246 from owncloud/share-lock-owner-parent
...
lock parent folders for the owner when locking a shared file as recipient
2015-07-02 10:38:08 +02:00
Joas Schilling
a6ea91996c
Fix duplicated line in doc block
2015-07-02 10:24:16 +02:00
Roeland Jago Douma
3c8c148734
Upgrade 3rdparty submodule for docterine v1.2.6
2015-07-02 10:04:24 +02:00
Thomas Müller
5580b0e7c0
Merge pull request #17310 from owncloud/master-remove-ocs-ids
...
[master] Remove OCS IDs
2015-07-02 09:19:33 +02:00
Lukas Reschke
b100036457
Bump versions
2015-07-02 09:18:41 +02:00
Lukas Reschke
d67d4f36bd
Delete OCS ID from DB if none is specified
...
If no OCS ID is specified in appinfo.xml and an app update is triggered and a OCS ID is stored in the DB we should clean the value.
Ref https://github.com/owncloud/activity/issues/320#issuecomment-117937748
2015-07-02 09:16:00 +02:00
Lukas Reschke
68f8717056
[master] Remove OCS IDs
...
While making the AppStore ready for 8.1 I also deleted some dummy entries which means that these IDs do not resolve anymore. We should remove them to prevent errors such as https://github.com/owncloud/core/issues/17307
Ref https://github.com/owncloud/activity/issues/320#issuecomment-117691867
2015-07-02 08:45:16 +02:00
Morris Jobke
61a60ffd47
Merge pull request #17293 from owncloud/revert-z-index
...
Revert z-index changes
2015-07-02 08:21:54 +02:00
Jenkins for ownCloud
d2e1cae331
[tx-robot] updated from transifex
2015-07-02 01:59:26 -04:00
Lukas Reschke
ba9b214aaa
Merge pull request #17295 from owncloud/scanfilesignature
...
Fix scanFile signature to avoid boring warning
2015-07-01 21:42:05 +02:00
Vincent Petry
9c06975bd5
Fix scanFile signature to avoid boring warning
2015-07-01 16:29:11 +02:00
Robin Appelman
57945dbc4b
fix typehinting
2015-07-01 16:13:33 +02:00
Jan-Christoph Borchardt
b80b1fbd24
Revert "fix z-index of share-autocomplete"
...
This reverts commit 4edf388a38
2015-07-01 16:12:55 +02:00
Jan-Christoph Borchardt
75451927b5
Revert "explicitly set z-index on app-content, fix overlap from navigation"
...
This reverts commit 71e5bc1803
2015-07-01 16:12:36 +02:00
Robin Appelman
207ce35ee9
phpdoc
2015-07-01 16:07:57 +02:00
Frank Karlitschek
2eb9936d77
This will be 8.2 in the future
2015-07-01 10:06:26 -04:00
Robin Appelman
faf642c31d
expose the mount manager in the public api
2015-07-01 15:57:04 +02:00
Morris Jobke
bad499baad
Merge pull request #17252 from owncloud/fix-php-errors-in-app-description
...
Only do the description kung-fu on strings
2015-07-01 15:44:21 +02:00
Vincent Petry
709eca2085
Merge pull request #17268 from owncloud/files-cleanuppartfileonlyonce
...
Clean up part file only once, not twice on error
2015-07-01 15:20:53 +02:00
Robin Appelman
3c0be7d126
only lock the parent folders
2015-07-01 15:10:25 +02:00
Robin Appelman
d6f56ea609
lock parent folders for the owner when locking a shared file as recipient
2015-07-01 15:10:22 +02:00
Lukas Reschke
fb2ec1dc56
Merge pull request #17285 from Rechenzentrum-Universitaet-Augsburg/master
...
Changed broken links to php manual
2015-07-01 14:21:03 +02:00
Michael Roth
78e02045c1
Changed broken links to php manual
2015-07-01 14:13:18 +02:00
Thomas Müller
aae55174f6
Only do the description kung-fu on strings - fixes #17028
2015-07-01 13:15:13 +02:00
Vincent Petry
cf245b80fe
Only delete part file on error if it is really a part file
2015-07-01 12:52:06 +02:00
Vincent Petry
5caeda33f1
Merge pull request #17273 from owncloud/s2s-catchmoreexceptiontypes
...
Catch more error codes thrown by federated shares
2015-07-01 12:30:32 +02:00
Morris Jobke
b476c125c0
Merge pull request #15363 from owncloud/ext-ocp
...
Use OCP classes as much as possible in files_external
2015-07-01 11:16:52 +02:00
Vincent Petry
5d3aa36355
Catch more error codes thrown by federated shares
...
Most of the time it doesn't make sense to forward Guzzle's
RequestException, so we convert it to StorageNotAvailable instead.
This prevents unpredictable error codes to block access to unrelated
folders needlessly.
2015-07-01 11:14:03 +02:00
Vincent Petry
fd4efdded9
Clean up part file only once, not twice on error
2015-07-01 09:47:05 +02:00
Robin McCorkell
728a22cda1
Use OCP classes as much as possible in files_external
2015-07-01 09:08:28 +02:00
Morris Jobke
b5c9196ffc
Merge pull request #17088 from owncloud/add-verbosity-to-upgrade
...
[upgrade] add verbosity check and show repair info & steps
2015-07-01 08:56:06 +02:00
Morris Jobke
4e44cc49d9
Merge pull request #17093 from owncloud/upgrade-timestamp
...
[upgrade] show timestamp for output during upgrade
2015-07-01 08:55:32 +02:00
