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

26129 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
f55aa856ad Remove file mapper - was only use in Windows and never worked properly 2015-07-03 15:41:29 +02:00
Thomas Müller
62f07261ea Merge pull request #17365 from owncloud/update-ref 
Update reference to include newest php-parser
 2015-07-03 15:29:37 +02:00
Björn Schießle
525745caf5 Merge pull request #17140 from owncloud/trashbin_occ 
add occ command to remove deleted files
 2015-07-03 15:10:50 +02:00
Morris Jobke
838ddc72c1 Merge pull request #17348 from owncloud/fix-lower-than 
Correct lower than wording
 2015-07-03 14:42:08 +02:00
Thomas Müller
7644c631e4 Merge pull request #15663 from owncloud/remove-ocp-app-register 
Remove \OCP\App::register()
 2015-07-03 13:44:58 +02:00
Robin Appelman
a0c089a1c9 add unit tests 2015-07-03 13:44:03 +02:00
Robin Appelman
b849b7c7f2 better handling of folders 2015-07-03 13:43:22 +02:00
Morris Jobke
208985dc1c fix wording 2015-07-03 12:54:49 +02:00
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
Lukas Reschke
7e8b71e1af Update reference to include newest php-parser 2015-07-03 10:04:02 +02:00
Lukas Reschke
0b8ced1ab3 Merge pull request #17345 from owncloud/app-code-check-search 
[app code check] add OC_Search_Provider and _Result
 2015-07-03 09:44:18 +02:00
Morris Jobke
9da10788bc Merge pull request #17349 from owncloud/share-onlyshowstaticownerifavailable 
Do not show static share owner if not available
 2015-07-03 09:31:40 +02:00
Joas Schilling
2118713477 Add OCS api to get, accept and decline remote shares 2015-07-03 09:30:49 +02:00
Joas Schilling
df303b910a Allow sharing with type remote share 2015-07-03 09:28:56 +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
Vincent Petry
34043d4647 Throw lock exceptions if remote share returned 423 status code 2015-07-03 07:51:13 +02: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
Vincent Petry
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
Lukas Reschke
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
Lukas Reschke
b21d4a55f2 Add missing type annotations 2015-07-02 16:36:40 +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
Morris Jobke
081264cb93 [app code check] add OC_Search_Provider and _Result 
Thanks to @libasys for noticing this.
 2015-07-02 16:20:20 +02:00
Joas Schilling
8294ad71fc Fix the path for users which have an exception for a group share 2015-07-02 15:35:31 +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
Roeland Jago Douma
c061497eca Only run some preview unit tets if imagemagick is available 2015-07-02 13:42:55 +02:00
Joas Schilling
ddb8cc2303 Use federated cloud id as a parameter type 2015-07-02 13:14:02 +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
Joas Schilling
aa7c8ad191 Add the item name to the federated sahre activity 2015-07-02 12:28:48 +02:00
Joas Schilling
95faaad5cf Use the app constant to fix the grouping 2015-07-02 12:27:58 +02:00
Joas Schilling
7e3f8d3ac1 Use the item name when refering to the unaccepted remote share 2015-07-02 12:26:06 +02:00
Lukas Reschke
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
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