summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* LDAP: make buttons on Expert page work again, fixes #5585Arthur Schiwon2013-11-042-13/+13
* Merge pull request #5544 from owncloud/fixing-3593-2-masterThomas Müller2013-11-042-1/+17
|\
| * add header 'OC-FileId' on PUTThomas Müller2013-10-251-0/+16
| * switch instance id and file idThomas Müller2013-10-251-1/+1
* | Merge pull request #5656 from owncloud/fix-wizard-typoAndreas Fischer2013-11-041-11/+11
|\ \
| * | Excpetion->ExceptionVicDeo2013-11-011-11/+11
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-0347-233/+333
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-03543-8563/+14034
* | | Merge pull request #5678 from owncloud/fix-api-documentationThomas Müller2013-11-0350-391/+842
|\ \ \
| * | | unify license headers for public API filesMorris Jobke2013-11-0345-382/+676
| * | | fix "No page-level DocBlock"Morris Jobke2013-11-0323-9/+166
* | | | Merge pull request #5671 from owncloud/fixing-5668-masterMorris Jobke2013-11-032-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | replace template function link_to_docs() with \OC_Helper::linkToDocs()Thomas Mueller2013-11-022-2/+2
* | | | Merge pull request #4961 from owncloud/unshare-over-deleteMorris Jobke2013-11-032-54/+85
|\ \ \ \
| * | | | Always select item_source.Andreas Fischer2013-11-031-3/+3
| * | | | Deduplicate expiration date check into a method.Andreas Fischer2013-11-031-15/+21
| * | | | Use unshareItem() when unsharing expired shares.Andreas Fischer2013-11-031-2/+2
| * | | | Use unshareItem() in unshareAll().Andreas Fischer2013-11-031-1/+1
| * | | | Extract unshare() code into unshareItem().Andreas Fischer2013-11-031-17/+1
| * | | | OCP\Share::unshareAll(): Deduplicate hook parameters.Andreas Fischer2013-11-031-8/+26
| * | | | Add tests for OCP\Share::unshareAll().Andreas Fischer2013-11-031-10/+33
|/ / / /
* | | | Merge pull request #5672 from owncloud/fixing-5668-master-2VicDeo2013-11-031-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | fixing Specified key was too long; max key length is 767 bytesThomas Mueller2013-11-021-1/+1
|/ / /
* | | Merge pull request #5652 from owncloud/front-port-5647-masterThomas Müller2013-11-011-15/+26
|\ \ \
| * | | extend unit test to directories starting or ending in whitespaceJörn Friedrich Dreyer2013-10-311-15/+26
* | | | Merge pull request #5443 from owncloud/fix-autoloader-cachingBart Visscher2013-11-012-24/+33
|\ \ \ \
| * | | | Allow null as cache parameter (if no cache was found) and for cache removal.Andreas Fischer2013-10-221-1/+1
| * | | | Only write-back on cache miss.Andreas Fischer2013-10-221-3/+3
| * | | | Only use autoloader cache when 'instanceid' is available.Andreas Fischer2013-10-221-5/+9
| * | | | Inject memoryCache into Autoloader. Remove recursion-prevention hack.Andreas Fischer2013-10-222-28/+33
* | | | | Merge pull request #5658 from owncloud/session-error-full-sentenceMorris Jobke2013-11-011-1/+1
|\ \ \ \ \
| * | | | | Make "Please contact your system administrator" a full sentence.Andreas Fischer2013-11-011-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #5653 from owncloud/fix-api-documentationMorris Jobke2013-11-018-417/+413
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fix documentation stuffMorris Jobke2013-10-318-417/+413
* | | | | Merge pull request #5551 from owncloud/fix-5202-masterMorris Jobke2013-10-311-1/+5
|\ \ \ \ \
| * | | | | When updating an appstore app, execute a database updateBart Visscher2013-10-251-1/+5
* | | | | | Merge pull request #5637 from owncloud/fix_privatedataJörn Friedrich Dreyer2013-10-315-51/+265
|\ \ \ \ \ \
| * | | | | | Get rid of the SELECT query. Try UPDATE, on failure INSERT.Andreas Fischer2013-10-311-8/+4
| * | | | | | testing update and deleteThomas Müller2013-10-311-0/+39
| * | | | | | fixing undefined index in delete()Thomas Müller2013-10-311-5/+7
| * | | | | | adding unit tests for deleteThomas Müller2013-10-311-0/+16
| * | | | | | PHPDoc comment updated - checkLoggedIn() removedThomas Müller2013-10-311-9/+10
| * | | | | | unit tests for set addedThomas Müller2013-10-311-5/+38
| * | | | | | no need to check if the user is logged inThomas Müller2013-10-311-1/+0
| * | | | | | fixing php notice: Undefined index keyThomas Müller2013-10-311-1/+1
| * | | | | | first two testsThomas Müller2013-10-311-0/+53
| * | | | | | no need to check if the user is logged in - this is already done in the ocs d...Thomas Müller2013-10-311-6/+6
| * | | | | | Merge branch 'master' into fix_privatedataThomas Müller2013-10-318-61/+81
| |\ \ \ \ \ \
| * | | | | | | increase version number to trigger db migrationFrank Karlitschek2013-10-301-1/+1
| * | | | | | | fix the privatedata key value storeFrank Karlitschek2013-10-303-43/+118