summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2016-01-2724-0/+36
* Merge pull request #21926 from owncloud/add-locking-support-for-onenoteThomas Müller2016-01-262-6/+12
|\
| * Add fake locking support for OneNote 2013Lukas Reschke2016-01-262-6/+12
|/
* Merge pull request #21664 from owncloud/comments-davThomas Müller2016-01-2614-3/+2145
|\
| * files_sharing requires int as file idArthur Schiwon2016-01-261-1/+1
| * adjust unit testsArthur Schiwon2016-01-263-7/+6
| * Revert "utilize elementMap for parsing DateTime string input argument for REP...Arthur Schiwon2016-01-261-8/+6
| * return 404 instead of 403 when attempting to create a comment on an not exist...Arthur Schiwon2016-01-261-3/+3
| * utilize elementMap for parsing DateTime string input argument for REPORT methodArthur Schiwon2016-01-261-6/+8
| * smaller changes related to reviewsArthur Schiwon2016-01-262-29/+17
| * Comments DAV implementationArthur Schiwon2016-01-2614-3/+2158
* | Merge pull request #21921 from owncloud/use-proper-tagThomas Müller2016-01-261-2/+1
|\ \
| * | Do not use duplicated tagLukas Reschke2016-01-261-2/+1
|/ /
* | Merge pull request #21912 from owncloud/issue-21908-trashbin-flickeringThomas Müller2016-01-262-10/+9
|\ \
| * | Hide the delete button, until we know its a custom avatarJoas Schilling2016-01-262-10/+9
| |/
* | Merge pull request #21833 from owncloud/use-proper-shared-uri-for-contactsThomas Müller2016-01-264-12/+11
|\ \
| * | Reassemble behavior on shared address books with respect to uri and displaynameThomas Müller2016-01-264-12/+11
| |/
* | Merge pull request #21752 from owncloud/files-delete-fixThomas Müller2016-01-262-13/+1
|\ \
| * | Remove faulty directory permissions testRobin McCorkell2016-01-151-10/+0
| * | Only check selection for delete permissions, not parent folderRobin McCorkell2016-01-151-3/+1
* | | Merge pull request #21916 from owncloud/sftp-handle-no-userThomas Müller2016-01-261-0/+3
|\ \ \
| * | | Handle no user set in sftp constructorRobin Appelman2016-01-261-0/+3
* | | | Merge pull request #21920 from owncloud/fix-firstrunwizard-buttonThomas Müller2016-01-261-1/+1
|\ \ \ \
| * | | | fix first run wizard button not wrappingJan-Christoph Borchardt2016-01-261-1/+1
|/ / / /
* | | | Merge pull request #21913 from owncloud/fix_resolve_user_group_shareVincent Petry2016-01-262-3/+32
|\ \ \ \ | |_|_|/ |/| | |
| * | | We must resolve to the proper usergroup shareRoeland Jago Douma2016-01-262-3/+32
|/ / /
* | | Merge pull request #21901 from owncloud/fix-setupThomas Müller2016-01-261-5/+8
|\ \ \
| * | | Fix setup pageMorris Jobke2016-01-261-5/+8
| |/ /
* | | Merge pull request #21853 from owncloud/tags-fixpropertymaThomas Müller2016-01-262-4/+2
|\ \ \
| * | | Fix TagList serializerVincent Petry2016-01-221-3/+1
| * | | Fix oc:tags tag list serializerVincent Petry2016-01-221-1/+1
* | | | Merge pull request #21845 from owncloud/sync-system-addressbook-on-avatar-changeThomas Müller2016-01-265-21/+40
|\ \ \ \
| * | | | Trigger change on avatar deleteThomas Müller2016-01-252-1/+3
| * | | | Assert that User::triggerChange is called upon avatar changeThomas Müller2016-01-251-3/+7
| * | | | Changing the avatar of the user emits the changeUser event which triggers upd...Thomas Müller2016-01-255-21/+34
* | | | | Merge pull request #21894 from owncloud/refactor-csrfThomas Müller2016-01-2617-79/+764
|\ \ \ \ \
| * | | | | Regenerate CSRF token upon loginLukas Reschke2016-01-251-0/+2
| * | | | | Add new CSRF manager for unit testing purposesLukas Reschke2016-01-2517-79/+762
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-26224-306/+90
* | | | | | Merge pull request #21892 from owncloud/issue-21890-parametersThomas Müller2016-01-259-21/+64
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Replace other usagesJoas Schilling2016-01-258-21/+25
| * | | | | Add parameters to public interfaceJoas Schilling2016-01-251-0/+39
| | |_|/ / | |/| | |
* | | | | Merge pull request #21885 from owncloud/add-size-minus-zero-to-avatarThomas Müller2016-01-253-18/+31
|\ \ \ \ \
| * | | | | Adding support of -1 as size to be passed into get and getFileThomas Müller2016-01-253-18/+31
| |/ / / /
* | | | | Merge pull request #21830 from owncloud/systemtags-sidebar-permissionsThomas Müller2016-01-259-249/+460
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | System tags sidebar selector now respects permissionsVincent Petry2016-01-258-248/+447
| * | | | Expose whether user is an admin through a methodVincent Petry2016-01-251-1/+13
|/ / / /
* | | | Merge pull request #18444 from owncloud/occ-config-typesThomas Müller2016-01-256-73/+413
|\ \ \ \
| * | | | Allow array recursion in getJoas Schilling2016-01-142-6/+31
| * | | | Allow deleting a nested system config valueJoas Schilling2016-01-143-16/+156
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-13 22:42:33 +0000