summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-1414-2/+46
* Merge pull request #16276 from owncloud/dav-quota-rootRobin Appelman2015-05-132-1/+7
|\
| * Added unit test to quota plugin for free_space argumentVincent Petry2015-05-131-1/+4
| * fix webdav quota check for the root of the dav endpointRobin Appelman2015-05-121-0/+3
* | Merge pull request #16284 from owncloud/shared-storage-viewLukas Reschke2015-05-131-20/+21
|\ \
| * | dont go trough the view when renaming/copying on shared storagesRobin Appelman2015-05-121-20/+21
* | | Merge pull request #16290 from owncloud/upgrade-info-for-3rdparty-appsLukas Reschke2015-05-131-0/+3
|\ \ \
| * | | Add info message for upgrade of an 3rdparty appMorris Jobke2015-05-121-0/+3
| |/ /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-1398-78/+386
* | | Merge pull request #16289 from owncloud/fix-stupid-mistakeLukas Reschke2015-05-121-0/+6
|\ \ \
| * | | Subadmin permissions are also not requiredLukas Reschke2015-05-121-0/+2
| * | | Add NoAdminRequired annotationLukas Reschke2015-05-121-0/+4
| |/ /
* | | Merge pull request #16269 from owncloud/master-fix-16179Morris Jobke2015-05-121-2/+6
|\ \ \ | |/ / |/| |
| * | Check if cURL supports the desired featuresLukas Reschke2015-05-121-2/+6
| |/
* | Merge pull request #16283 from owncloud/fix-search-usersMorris Jobke2015-05-121-1/+8
|\ \
| * | fix user mgmt search box position, fix #15928Jan-Christoph Borchardt2015-05-121-1/+8
* | | Merge pull request #16282 from owncloud/fix-multiselect-ellipsizeMorris Jobke2015-05-121-0/+1
|\ \ \
| * | | ellipsize first item in multiselect, fix #16174Jan-Christoph Borchardt2015-05-121-0/+1
* | | | Merge pull request #16104 from owncloud/resize-filepickerJan-Christoph Borchardt2015-05-122-2/+7
|\ \ \ \
| * | | | add max-width of 600px to filepickerMorris Jobke2015-05-061-1/+2
| * | | | Resize filepicker on window size changeMorris Jobke2015-05-061-1/+5
* | | | | Merge pull request #16277 from owncloud/fix-15971Morris Jobke2015-05-122-4/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | remove superflous button. fixes #15971Arthur Schiwon2015-05-122-4/+1
| | |/ / | |/| |
* | | | 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
|\ \ \ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-28 02:44:23 +0000