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
ded2b2b690
Merge pull request #17353 from owncloud/apps-keepgloballist
...
Fix global app list state
2015-07-02 20:00:56 +02:00
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
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
d5b7e40c19
Unit test for app list
2015-07-02 17:22:56 +02:00
2f6dc8743e
Fix global app list state
2015-07-02 17:15:14 +02:00
71ae96bb56
Do not show static share owner if not available
...
In some corner cases, an outgoing share exists but sharing is not
allowed for the current user. This would cause the file list to break
because the static text could not be rendered as the owner was
undefined.
2015-07-02 16:38:20 +02:00
8335c7a4e9
Correct wording
...
If a max version of 8.0.1 has been specified the message should indicate that 8.0.1 is also supported.
2015-07-02 16:37:39 +02:00
b21d4a55f2
Add missing type annotations
2015-07-02 16:36:40 +02:00
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
081264cb93
[app code check] add OC_Search_Provider and _Result
...
Thanks to @libasys for noticing this.
2015-07-02 16:20:20 +02:00
8294ad71fc
Fix the path for users which have an exception for a group share
2015-07-02 15:35:31 +02:00
e65034e4bc
Do not register JS share plugin if core sharing API is disabled
2015-07-02 14:56:33 +02:00
c061497eca
Only run some preview unit tets if imagemagick is available
2015-07-02 13:42:55 +02:00
ddb8cc2303
Use federated cloud id as a parameter type
2015-07-02 13:14:02 +02:00
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
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
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
079e9cecba
Revert "Use OCP classes as much as possible in files_external"
2015-07-02 13:00:21 +02:00
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
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
aa7c8ad191
Add the item name to the federated sahre activity
2015-07-02 12:28:48 +02:00
95faaad5cf
Use the app constant to fix the grouping
2015-07-02 12:27:58 +02:00
7e3f8d3ac1
Use the item name when refering to the unaccepted remote share
2015-07-02 12:26:06 +02:00
62e3de1bdb
Check if response could get generated
...
`json_encode` fails hard on PHP >= 5.5 if a non UTF-8 value is specified by returning false. Older PHP versions just nullify the value which makes it at least somewhat usable.
This leads to very confusing errors which are very hard to debug since developers are usually not aware of this. In this case I'd consider throwing a fatal exception – since it arguably is an error situation – is a fair solution since this makes developers and administrators aware of any occurence of the problem so that these bugs can get fixed.
Fixes https://github.com/owncloud/core/issues/17265
2015-07-02 11:42:51 +02:00
f52eec765c
owner is stored as 'uid_owner', not as 'owner' in the oc_share table
2015-07-02 10:49:22 +02:00
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
a6ea91996c
Fix duplicated line in doc block
2015-07-02 10:24:16 +02:00
3c8c148734
Upgrade 3rdparty submodule for docterine v1.2.6
2015-07-02 10:04:24 +02:00
5580b0e7c0
Merge pull request #17310 from owncloud/master-remove-ocs-ids
...
[master] Remove OCS IDs
2015-07-02 09:19:33 +02:00
b100036457
Bump versions
2015-07-02 09:18:41 +02:00
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
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
61a60ffd47
Merge pull request #17293 from owncloud/revert-z-index
...
Revert z-index changes
2015-07-02 08:21:54 +02:00
d2e1cae331
[tx-robot] updated from transifex
2015-07-02 01:59:26 -04:00
ba9b214aaa
Merge pull request #17295 from owncloud/scanfilesignature
...
Fix scanFile signature to avoid boring warning
2015-07-01 21:42:05 +02:00
9c06975bd5
Fix scanFile signature to avoid boring warning
2015-07-01 16:29:11 +02:00
57945dbc4b
fix typehinting
2015-07-01 16:13:33 +02:00
b80b1fbd24
Revert "fix z-index of share-autocomplete"
...
This reverts commit 4edf388a38
2015-07-01 16:12:55 +02:00
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
207ce35ee9
phpdoc
2015-07-01 16:07:57 +02:00
2eb9936d77
This will be 8.2 in the future
2015-07-01 10:06:26 -04:00
faf642c31d
expose the mount manager in the public api
2015-07-01 15:57:04 +02:00
dd20cd1995
remove no longer needed readonly wrapper
2015-07-01 15:45:54 +02:00
365fafc9bc
use permissions mask wrapper instead of readonly wrapper
2015-07-01 15:45:23 +02:00
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
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
3c0be7d126
only lock the parent folders
2015-07-01 15:10:25 +02:00
d6f56ea609
lock parent folders for the owner when locking a shared file as recipient
2015-07-01 15:10:22 +02:00
fb2ec1dc56
Merge pull request #17285 from Rechenzentrum-Universitaet-Augsburg/master
...
Changed broken links to php manual
2015-07-01 14:21:03 +02:00
Morris Jobke
Lukas Reschke
Vincent Petry
Bjoern Schiessle
Joas Schilling
Roeland Jago Douma
Thomas Müller
Joas Schilling
Jenkins for ownCloud
Robin Appelman
Jan-Christoph Borchardt
Frank Karlitschek