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

30247 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
2035a179bc Add store/retrieve checksums 
* Add extra db column to filecache
* Bump version
* Update filecache code to actually handle checksum
* Webdav code to store/retrieve checksums
 2016-02-03 09:03:51 +01:00
Thomas Müller
d4b356e0e9 Merge pull request #21961 from owncloud/comments-gui 
Comments GUI in files sidebar
 2016-02-03 09:03:43 +01:00
Thomas Müller
77942ad38a Merge pull request #22059 from owncloud/comments-readmark-dav 
Comments DAV methods for read mark manipulation (mark comments of a file as read) + return isUnread status
 2016-02-03 09:00:32 +01:00
Thomas Müller
1531e7f440 Merge pull request #22053 from owncloud/files_external-params-flags 
Remove magic flags from files_external backend params
 2016-02-03 09:00:17 +01:00
Jenkins for ownCloud
92a1d1c0e3 [tx-robot] updated from transifex 2016-02-03 01:55:26 -05:00
Morris Jobke
d7892619b1 Merge pull request #22076 from owncloud/activities-yes-default-enabled-no 
Don't enable tag activities for email by default
 2016-02-02 18:20:20 +01:00
Vincent Petry
5e08f1df78 Add comments app to expected apps in test 2016-02-02 18:16:54 +01:00
Robin Appelman
8a30058f52 filter invalid storages from the mount cache early 2016-02-02 18:10:13 +01:00
Vincent Petry
8b98cf5a5b Fixed report name 2016-02-02 18:06:16 +01:00
Vincent Petry
03f4b49ecc Added JS unit tests for comments 2016-02-02 18:01:15 +01:00
Vincent Petry
9028457ea2 Add spinner when submitting comments 2016-02-02 18:01:15 +01:00
Vincent Petry
d81c00304f Fix parsing empty Webdav property nodes 
Return empty string instead of undefined
 2016-02-02 18:01:15 +01:00
Vincent Petry
3a6d065e50 Fix formatting messages with newlines 2016-02-02 18:01:15 +01:00
Vincent Petry
64ad99db70 Better comments pagination logic 2016-02-02 18:01:15 +01:00
Vincent Petry
fdf555e814 Improve comments style, add avatars 2016-02-02 18:01:15 +01:00
Vincent Petry
3b581b051f Expose display name in JS side 
Adds a new method `OC.getCurrentUser` to get both the user id and
display name Could be used for a future Js
 2016-02-02 18:01:15 +01:00
Vincent Petry
67a36a2cca Use last comment's time for pagination 2016-02-02 18:01:15 +01:00
Vincent Petry
29386eccf9 Add pagination support for comments GUI 2016-02-02 18:01:15 +01:00
Vincent Petry
d1518045ec Improve comment date format 2016-02-02 18:01:15 +01:00
Vincent Petry
cca33942aa Comments GUI 2016-02-02 18:01:15 +01:00
Joas Schilling
5a3d2ef2a1 Don't enable tag activities by default 2016-02-02 16:29:49 +01:00
Thomas Müller
0e95b9f2d5 Merge pull request #22054 from vincchan/vincchan/fix#20199 
Move data protection check to javascript
 2016-02-02 15:59:07 +01:00
Robin Appelman
f4e1a1677b Remove magic flags from files_external backend params 2016-02-02 15:10:59 +01:00
Vincent Chan
879917f5f1 Do not allow username to have space at the beginning or at the end 
fixes #22035
 2016-02-02 14:56:19 +01:00
Arthur Schiwon
064b96ec1c update routine was lacking where statements 🙈 2016-02-02 14:30:35 +01:00
Roeland Jago Douma
dc32f49c6e [Share 2.0] Use GenericShareException 2016-02-02 14:23:45 +01:00
Roeland Jago Douma
4d7130ad31 [Share 2.0] Add exceptions to OCP 2016-02-02 14:07:11 +01:00
Thomas Müller
8049b6e998 Merge pull request #22023 from owncloud/interruptable-commands 
Interruptable commands
 2016-02-02 14:07:07 +01:00
Thomas Müller
ce053b9808 Merge pull request #22013 from owncloud/share2_moveshare 
[Share 2.0] Allow moving of shares
 2016-02-02 13:34:50 +01:00
Thomas Müller
2d1d89ee29 Merge pull request #22049 from owncloud/issue-22041-activities-for-systemtags 
Issue 22041 activities for systemtags
 2016-02-02 13:08:01 +01:00
Robin Appelman
51b5179839 Add occ command to manage applicables 2016-02-02 12:45:10 +01:00
Thomas Müller
37d6fff976 Merge pull request #22055 from owncloud/systemtags-checkfileidowner 
Make sure user has access to file for system tag operations
 2016-02-02 12:37:52 +01:00
Thomas Müller
eee6f3d406 Merge pull request #22057 from owncloud/share2_update_hash 
Update old password hashed for link shares on access
 2016-02-02 12:37:31 +01:00
Thomas Müller
c9006d6d56 Merge pull request #21988 from owncloud/allow-search-in-synced-addressbooks 
Allow search in synced addressbooks
 2016-02-02 12:37:12 +01:00
Roeland Jago Douma
2316cb1f8b [Share 2.0] Allow moving of shares 
* Only recipient can move a share
* Unit tests
 2016-02-02 11:34:52 +01:00
Roeland Douma
8ebdfd0e05 Merge pull request #22005 from owncloud/share2_getshare_byid_as_recipient 
[Share 2.0] Allow recipient to be passed in to getShareById
 2016-02-02 11:34:20 +01:00
Thomas Müller
dfb88612af Filter contacts from the local system addressbook - remote share with local users is not allowed 2016-02-02 11:24:26 +01:00
Joas Schilling
7f563dc3e9 Fix path match 2016-02-02 11:12:16 +01:00
Thomas Müller
22de25c382 PHP 5.4 compatibility 2016-02-02 10:56:33 +01:00
Thomas Müller
847b1e3af0 In some cases $contact['CLOUD'] is not an array 2016-02-02 10:56:33 +01:00
Thomas Müller
ca25055cc8 Register all system address books to the contacts manager 2016-02-02 10:56:33 +01:00
Thomas Müller
b01d50216e The local address book is replaced now by the system addressbook as part of the dav app 2016-02-02 10:56:33 +01:00
Roeland Jago Douma
df690cd1f2 getChildren should not return usergroup shares 2016-02-02 10:41:57 +01:00
Roeland Jago Douma
403547f0ea [Share 2.0] Allow recipient to be passed in to getShareById 
* This allows us to retrieve usergroup shares for a given id.
  If the user deleted a share or moved it this will be a different share
 2016-02-02 10:41:57 +01:00
Vincent Chan
59cfeae2cd changed variables to lowercase 2016-02-02 10:32:50 +01:00
Thomas Müller
4777f78187 Merge pull request #20903 from owncloud/sharing-mount-option 
Add mount option to disable sharing
 2016-02-02 10:26:24 +01:00
Thomas Müller
e60b217156 Merge pull request #22015 from owncloud/share-no-permissions 
Block shares that dont have the correct source permissions
 2016-02-02 10:26:06 +01:00
Joas Schilling
b5e40bc8f6 Fix IManager::isFormattingFilteredObject() 2016-02-02 10:11:58 +01:00
Joas Schilling
25cbc17bec Add activities when a tag is (un-)assigned 2016-02-02 10:11:58 +01:00
Joas Schilling
dfe677fabb Add activities for admins when a tag is created/updated/deleted 2016-02-02 09:57:43 +01:00