summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* increase version numberBjoern Schiessle2016-03-011-1/+1
* Handle null caseThomas Müller2016-03-011-2/+5
* fix doc-blockBjoern Schiessle2016-02-291-0/+1
* remove synced remote address book if the remote server revoked access to his ...Bjoern Schiessle2016-02-297-7/+39
* remove remote address book if the admin removes the server from the trusted s...Bjoern Schiessle2016-02-299-18/+97
* reuse the url_hash instead of calculating a new hash for the address bookBjoern Schiessle2016-02-265-13/+14
* Merge pull request #22660 from owncloud/fix_22656Thomas Müller2016-02-263-0/+42
|\
| * Do not allow sharing of the root folderRoeland Jago Douma2016-02-253-0/+42
* | Merge pull request #22671 from owncloud/issue-22670Thomas Müller2016-02-262-26/+26
|\ \
| * | Move the tag filter at the end for nowJoas Schilling2016-02-262-26/+26
* | | Merge pull request #22646 from owncloud/fix_22642Thomas Müller2016-02-262-22/+43
|\ \ \
| * | | Set default expiration date if none given on share creationRoeland Jago Douma2016-02-252-22/+43
* | | | Merge pull request #22640 from owncloud/fix_22587Thomas Müller2016-02-262-0/+129
|\ \ \ \
| * | | | Remove delete permissions for read-only federated resharesRoeland Jago Douma2016-02-252-0/+129
| |/ / /
* | | | Merge pull request #22608 from owncloud/collaborative-tagsThomas Müller2016-02-263-4/+5
|\ \ \ \
| * | | | Rename system tags app to collaborative tagsJoas Schilling2016-02-263-4/+5
| | |/ / | |/| |
* | | | Merge pull request #22461 from owncloud/fix_6773Thomas Müller2016-02-2616-77/+166
|\ \ \ \
| * | | | Fix favorite icon unit test for icon imageVincent Petry2016-02-251-2/+4
| * | | | Make more action icons themable + style fixesVincent Petry2016-02-256-24/+25
| * | | | Close classRoeland Jago Douma2016-02-251-1/+1
| * | | | Make file actions use icon CSS classesRoeland Jago Douma2016-02-2510-54/+140
* | | | | Merge pull request #22650 from owncloud/fix_hookThomas Müller2016-02-262-3/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix verifyExpirationDate passwordSet argumentRoeland Jago Douma2016-02-252-3/+4
| | |/ / | |/| |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-2656-34/+210
| |/ / |/| |
* | | Merge pull request #22584 from owncloud/fix-app-load-order-fixes-22508Thomas Müller2016-02-252-4/+4
|\ \ \
| * | | Fix PHPDoc of OC_App::loadApps()Thomas Müller2016-02-231-1/+1
| * | | Install new shipped apps after upgrading all existing appsThomas Müller2016-02-231-4/+4
| * | | Before installing new shipped apps we need to load authentication apps - fixe...Thomas Müller2016-02-231-1/+1
* | | | Merge pull request #22653 from owncloud/integration-tests-for-dav-csrfThomas Müller2016-02-252-2/+127
|\ \ \ \
| * | | | Fix typoLukas Reschke2016-02-251-1/+1
| * | | | Add integration test for CSRF protection on DAVLukas Reschke2016-02-252-2/+127
| | |_|/ | |/| |
* | | | Merge pull request #22654 from owncloud/icon-fixesThomas Müller2016-02-253-0/+17
|\ \ \ \
| * | | | add download icon for image detail view, ref gallery issue 51Jan-Christoph Borchardt2016-02-253-0/+17
* | | | | Merge pull request #22659 from owncloud/fix-formattingThomas Müller2016-02-252-54/+62
|\ \ \ \ \
| * | | | | Fix formatting of responseLukas Reschke2016-02-252-54/+62
| | |/ / / | |/| | |
* | | | | Merge pull request #22658 from owncloud/exclude-ocs-provider-from-rewrite-rulesThomas Müller2016-02-251-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Exclude ocs-provider from rewrite ruleLukas Reschke2016-02-251-0/+1
|/ / / /
* | | | Merge pull request #22644 from owncloud/external-share-managerThomas Müller2016-02-251-3/+4
|\ \ \ \
| * | | | inject the correct external share manager into the storageRobin Appelman2016-02-251-3/+4
* | | | | Merge pull request #21854 from owncloud/fix-share-hook-group-addThomas Müller2016-02-251-0/+17
|\ \ \ \ \
| * | | | | Fix addUserToGroup hook of the share codeMorris Jobke2016-01-221-0/+17
* | | | | | Merge pull request #22628 from owncloud/fix-thrashbin-cronjobThomas Müller2016-02-251-0/+6
|\ \ \ \ \ \
| * | | | | | Skip users with no trashbinVictor Dubiniuk2016-02-241-0/+6
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #22611 from owncloud/add-uid-on-hoverThomas Müller2016-02-252-3/+12
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Tweak tooltip style for recipientsVincent Petry2016-02-252-2/+10
| * | | | | Add the uid on hover for sharing autocompleteJoas Schilling2016-02-241-1/+2
* | | | | | Merge pull request #22636 from owncloud/fix-ssl-on-external-storagesThomas Müller2016-02-254-12/+45
|\ \ \ \ \ \
| * | | | | | Properly cast typeLukas Reschke2016-02-243-11/+40
| * | | | | | Add proxy support to external storageLukas Reschke2016-02-241-1/+5
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #22604 from owncloud/fix-google-drive-encryptionThomas Müller2016-02-251-5/+11
|\ \ \ \ \ \