summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix user mgmt search box position, fix #15928Jan-Christoph Borchardt2015-05-121-1/+8
* Merge pull request #16127 from owncloud/fix-file-icons-in-shared-file-viewJan-Christoph Borchardt2015-05-123-1/+4
|\
| * Enable file icons & previews in "Shared ..." categoriesMorris Jobke2015-05-063-1/+4
* | Merge pull request #16271 from owncloud/use-activeJan-Christoph Borchardt2015-05-121-2/+2
|\ \
| * | Use active instead of non existing pressedLukas Reschke2015-05-121-2/+2
* | | Merge pull request #16228 from owncloud/enc_fix_restoreBjörn Schießle2015-05-126-22/+156
|\ \ \ | |/ / |/| |
| * | use hooks to update encryption keys instead of the storage wrapper if a file ...Bjoern Schiessle2015-05-116-22/+156
* | | Merge pull request #16233 from owncloud/enc_fix_check_if_file_is_excludedMorris Jobke2015-05-122-1/+2
|\ \ \
| * | | fix check if file is excluded from encryptionBjoern Schiessle2015-05-112-1/+2
| |/ /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-1230-26/+20
* | | Merge pull request #15881 from owncloud/share-moveversionsproperlyVincent Petry2015-05-112-31/+174
|\ \ \
| * | | Fix version rename with files and foldersVincent Petry2015-04-272-31/+174
* | | | Merge pull request #16234 from owncloud/issue-16206-fix-app-config-parallel-i...Morris Jobke2015-05-112-80/+172
|\ \ \ \
| * | | | Use insertIfNotExists to avoid problems with parallel callsJoas Schilling2015-05-112-15/+22
| * | | | Add a test for parallel insertJoas Schilling2015-05-111-12/+29
| * | | | Always test the object and the legacy classJoas Schilling2015-05-111-59/+127
* | | | | Merge pull request #15815 from owncloud/unshare-etag-propagateMorris Jobke2015-05-113-80/+51
|\ \ \ \ \
| * | | | | Update etag of direct parent on unshareVincent Petry2015-04-283-80/+51
* | | | | | Merge pull request #16208 from owncloud/fix-language-selection-sr-latinThomas Müller2015-05-111-0/+11
|\ \ \ \ \ \
| * | | | | | Some locales need to be converted to be compliant with CLDRThomas Müller2015-05-081-0/+11
* | | | | | | Merge pull request #16213 from cmeh/patch-5Morris Jobke2015-05-111-2/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Grammar, removal of line breakChristian Hoffmann2015-05-091-2/+1
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-1120-6/+66
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-1056-20/+148
|/ / / / / /
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-09134-488/+134
* | | | | | Merge pull request #16203 from owncloud/add-warning-for-people-that-cant-readThomas Müller2015-05-081-0/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add warning to OCC as well in case another PHP version is used thereLukas Reschke2015-05-081-0/+8
| | |_|/ / | |/| | |
* | | | | Merge pull request #16124 from owncloud/issue-16109-fix-share-email-with-shar...Lukas Reschke2015-05-081-0/+5
|\ \ \ \ \
| * | | | | Fix the share mail notification when the item is in a folderJoas Schilling2015-05-061-0/+5
* | | | | | Merge pull request #16155 from owncloud/enc_admin_settingsBjörn Schießle2015-05-083-63/+90
|\ \ \ \ \ \
| * | | | | | improved admin settingsBjoern Schiessle2015-05-083-63/+90
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #16146 from owncloud/issue-16103-hide-module-already-exist...Lukas Reschke2015-05-081-1/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Avoid the log entry with the ModuleAlreadyExists exception when enabling the appJoas Schilling2015-05-071-1/+7
* | | | | | Merge pull request #16168 from owncloud/cron-errorsLukas Reschke2015-05-081-3/+1
|\ \ \ \ \ \
| * | | | | | fix cron errors to only appear in one line instead of introducing another listJan-Christoph Borchardt2015-05-071-3/+1
* | | | | | | Merge pull request #16170 from owncloud/fix-15621Thomas Müller2015-05-081-6/+9
|\ \ \ \ \ \ \
| * | | | | | | drop global file cache support, fixes #15621Arthur Schiwon2015-05-071-6/+9
| |/ / / / / /
* | | | | | | Merge pull request #16183 from owncloud/fix-16147Thomas Müller2015-05-081-2/+2
|\ \ \ \ \ \ \
| * | | | | | | check optional parameter before using it, fixes #16147Arthur Schiwon2015-05-071-2/+2
* | | | | | | | Merge pull request #16159 from owncloud/webdav-cross-storage-mioveMorris Jobke2015-05-081-10/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | use cross storage move when renaming the part file during webdav putRobin Appelman2015-05-071-10/+12
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #16160 from owncloud/issue-15924-php-notice-empty-path-pat...Morris Jobke2015-05-082-1/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | Add a test for getting the versions of an empty pathJoas Schilling2015-05-071-1/+12
| * | | | | | | | Do not run method when the path is emptyJoas Schilling2015-05-071-0/+3
| |/ / / / / / /
* | | | | | | | Merge pull request #16175 from owncloud/fix-enc-typoJoas Schilling2015-05-081-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix typo in encryption module messageMorris Jobke2015-05-071-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-0838-40/+234
* | | | | | | | 8.1.0 beta 1v8.1.0beta1Frank Karlitschek2015-05-071-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #16153 from owncloud/CopyEtagHeaderPlugin-noargJoas Schilling2015-05-071-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | \OC\Connector\Sabre\CopyEtagHeaderPlugin constructor does not take arguments.Andreas Fischer2015-05-071-1/+1
|/ / / / / /
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-29 09:51:26 +0000