summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-02-1010-18/+20
|
* Merge pull request #13425 from owncloud/phpdoc_cleanupMorris Jobke2015-02-106-24/+24
|\ | | | | Cleanup of PHPDoc return types
| * Cleanup of PHPDoc return typesRobin McCorkell2015-01-166-24/+24
| |
* | Merge pull request #13663 from ↵Morris Jobke2015-02-102-5/+17
|\ \ | | | | | | | | | | | | owncloud/issue/13624-notification-when-favorting-fails Only update favorite icon if the operation was successful
| * | toggle back when the action was not performedJoas Schilling2015-02-021-2/+7
| | |
| * | fix response for tags and show error messageMorris Jobke2015-02-022-6/+11
| | |
| * | Only update favorite icon if the operation was successfulJoas Schilling2015-02-021-1/+3
| | | | | | | | | | | | Also shows a notification in case an error occured on updating the tags
* | | Merge pull request #13925 from owncloud/fix-13898blizzz2015-02-092-5/+11
|\ \ \ | | | | | | | | no fruitless count attempts, and notification should disappear
| * | | no fruitless count attempts, and notification should disappearArthur Schiwon2015-02-052-5/+11
| | | |
* | | | Merge pull request #13364 from is-apps/files_external_cleanupVincent Petry2015-02-093-57/+82
|\ \ \ \ | | | | | | | | | | Clean up files_external
| * | | | Updated Dropbox and Google UI Javascript to create input elements instead of ↵Ross Nicoll2015-01-142-3/+7
| | | | | | | | | | | | | | | | | | | | anchor.
| * | | | Change from array() to [] style in files_external application info.Ross Nicoll2015-01-141-54/+75
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-0912-12/+110
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-088-10/+26
| | | | |
* | | | | Merge pull request #13502 from owncloud/streamline-authentication-in-newfileMorris Jobke2015-02-071-6/+3
|\ \ \ \ \ | | | | | | | | | | | | Streamline CSRF and login check
| * | | | | Streamline CSRF and login checkLukas Reschke2015-01-201-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | Let's make this consistent with other pieces of the code to make it easier to auditable.
* | | | | | Merge pull request #13655 from Sugaroverdose/fix_#13632Morris Jobke2015-02-072-2/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | Do not change color of 'new' button on hover and make new file menu more consistent with button
| * | | | | | Prevent 1px padding between button and dropdown in ie11 when zoomingSugaroverdose2015-01-281-1/+1
| | | | | | |
| * | | | | | Play with z-index to make proper dropdown overlapSugaroverdose2015-01-282-1/+8
| | | | | | |
| * | | | | | Fix #13632 and make new file menu more consistent with buttonSugaroverdose2015-01-251-1/+3
| | | | | | |
* | | | | | | Merge pull request #13848 from owncloud/ldap-warnMorris Jobke2015-02-071-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Reduce log level of bind failed to WARN - fixes #11624
| * | | | | | | Reduce log level of bind failed to WARN - fixes #11624Morris Jobke2015-02-031-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #13889 from owncloud/catch-exceptionMorris Jobke2015-02-072-8/+18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Catch exception properly
| * | | | | | | | Catch exception properlyLukas Reschke2015-02-042-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `\OCA\Files\Helper::buildFileStorageStatistics` might throw an exception from `OC_Helper::getStorageInfo`, previously this lead to a uncatched exception being thrown when invoking this methods. This was user triggable by for example calling `/index.php/apps/files/ajax/delete.php` with a not existing dir (for example `dir=asdf/../&allfiles=true`)
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-0710-4/+50
| | | | | | | | |
* | | | | | | | | Revert "Add OCS sharing info to capabilities"Lukas Reschke2015-02-073-280/+0
| | | | | | | | |
* | | | | | | | | Merge pull request #13692 from rullzer/capabilitiesFrank Karlitschek2015-02-063-0/+280
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add OCS sharing info to capabilities
| * | | | | | | | | Updated unit testsRoeland Jago Douma2015-02-061-43/+123
| | | | | | | | | |
| * | | | | | | | | Bit better formatting when using json outputRoeland Jago Douma2015-02-061-2/+4
| | | | | | | | | |
| * | | | | | | | | Updated sharing capabilitiesRoeland Jago Douma2015-02-061-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved to files_sharing Added more capabilities. Tried to order to capabilities more OO style
| * | | | | | | | | Split up unit testsRoeland Jago Douma2015-02-041-16/+24
| | | | | | | | | |
| * | | | | | | | | Added unit test to test getCapabilities for files_sharingRoeland Jago Douma2015-02-041-0/+113
| | | | | | | | | |
| * | | | | | | | | Converted getCapabilities to non static functionRoeland Jago Douma2015-02-041-7/+24
| | | | | | | | | |
| * | | | | | | | | Use single quotesRoeland Jago Douma2015-02-041-7/+7
| | | | | | | | | |
| * | | | | | | | | Only return capabilities if they are setRoeland Jago Douma2015-02-041-14/+8
| | | | | | | | | |
| * | | | | | | | | Added capabilities whether a server allows public linksRoeland Jago Douma2015-02-042-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes #13673. It now lists link sharing, passwords enforced, and if public uploads are allowed.
* | | | | | | | | | Merge pull request #13954 from owncloud/fix-enc-mig-user-retrievalThomas Müller2015-02-062-7/+18
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix enc mig user retrieval
| * | | | | | | | | | always specify limit, except you do like questionable surprisesArthur Schiwon2015-02-062-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | always specify limit, except you do like questionable surprises, part 2
* | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-0616-86/+94
| | | | | | | | | | |
* | | | | | | | | | | don't check if we have a valid userBjoern Schiessle2015-02-061-5/+1
|/ / / / / / / / / /
* | | | | | | / / / [tx-robot] updated from transifexJenkins for ownCloud2015-02-0616-12/+114
| |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-054-2/+4
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #13849 from owncloud/ldap-oc8-updateblizzz2015-02-042-49/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | no update routine needed from OC 7 to 8
| * | | | | | | no update routine needed from OC 7 to 8Arthur Schiwon2015-02-032-49/+1
| |/ / / / / /
* / / / / / / [tx-robot] updated from transifexJenkins for ownCloud2015-02-0418-16/+88
|/ / / / / /
* | | | | | Merge pull request #13837 from owncloud/endless-redirectThomas Müller2015-02-031-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add callCheck to testremote.php
| * | | | | | Add callCheck to testremote.phpLukas Reschke2015-02-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Without CSRF check this file might be tricked into requesting itself which would result in an endless loop and thus potentially ending in a Denial of Service.
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-0322-42/+100
|/ / / / / /
* | | | | | Merge pull request #13817 from owncloud/core-apps-dependenciesMorris Jobke2015-02-022-0/+6
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | encryption requires openssl and user_ldap requires ldap :speak_no_evil:
| * | | | | encryption requires openssl and user_ldap requires ldap :speak_no_evil:Thomas Müller2015-02-022-0/+6
| | | | | |