summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-06-21142-262/+1721
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-214-0/+8
| * Catch exceptions while creating shared mounts (#25077)Robin Appelman2016-06-202-11/+25
| * Don't send activity to non-admins when assigning invisible tags (#25192)Vincent Petry2016-06-201-0/+4
| * Merge pull request #25173 from owncloud/fix_conversion_issuesVincent Petry2016-06-204-0/+6
| |\
| | * Fix conversion issuesJuan Pablo Villafáñez2016-06-204-0/+6
| * | Merge pull request #25162 from owncloud/password-login-forbidden-hintVincent Petry2016-06-208-28/+176
| |\ \
| | * | PasswordLoginForbidden must extend NotAuthenticatedVincent Petry2016-06-171-2/+2
| | * | throw PasswordLoginForbidden on DAVChristoph Wurst2016-06-173-3/+60
| | * | add PasswordLoginForbiddenExceptionChristoph Wurst2016-06-177-27/+118
| * | | Merge pull request #25159 from owncloud/share-app-initorderVincent Petry2016-06-201-3/+3
| |\ \ \
| | * | | Delay files_sharing's registerMountProvidersVincent Petry2016-06-171-3/+3
| * | | | Update ExcludeFileByNameFilterIterator.php (#25184)Thomas Müller2016-06-201-0/+1
| * | | | Merge pull request #25010 from owncloud/gdrive-fix-testsVincent Petry2016-06-201-2/+2
| |\ \ \ \
| | * | | | Fix GDrive test rename overwrite folderVincent Petry2016-06-101-2/+2
| * | | | | Merge pull request #25161 from owncloud/fixgetsharefolderVincent Petry2016-06-202-5/+9
| |\ \ \ \ \
| | * | | | | Make getShareFolder use given view instead of static FSVincent Petry2016-06-172-5/+9
| | | |_|/ / | | |/| | |
| * | | | | Merge pull request #25120 from owncloud/settings_fix_checkbox_newlineVincent Petry2016-06-202-3/+7
| |\ \ \ \ \
| | * | | | | files_external: Keep checkbox and its label on one line #20032 #22655Markus Goetz2016-06-172-3/+7
| | | |_|_|/ | | |/| | |
| * | | | | Merge pull request #25174 from owncloud/tokenmapper-close-cursorVincent Petry2016-06-201-0/+1
| |\ \ \ \ \
| | * | | | | close cursor after loading a tokenChristoph Wurst2016-06-171-0/+1
| | |/ / / /
| * | | | | Merge pull request #25168 from owncloud/capped-user-cacheVincent Petry2016-06-201-2/+4
| |\ \ \ \ \
| | * | | | | Capped cache for user configJörn Friedrich Dreyer2016-06-171-2/+4
| | | |/ / / | | |/| | |
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-2016-4/+130
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-184-2/+68
| * | | | | Merge pull request #25158 from owncloud/removerootshares-delaygetrootfolderVincent Petry2016-06-171-1/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Use getLazyRootFolder from RemoveRootShares repair stepVincent Petry2016-06-171-1/+1
| | |/ / /
| * | | | Added test with new endpoint (#23934)Sergio Bertolín2016-06-172-37/+55
| * | | | Merge pull request #25153 from owncloud/fix-problem-added-in-25023Vincent Petry2016-06-171-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Changed global variable to localSergio Bertolín2016-06-171-1/+1
| |/ / /
| * | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-1728-6/+176
| * | | Merge pull request #24965 from owncloud/streams-0.4.1Vincent Petry2016-06-166-52/+39
| |\ \ \
| | * | | Update submodule for 3rdparty icewind/streams updateVincent Petry2016-06-161-0/+0
| | * | | update icewind/streams to 0.4.1Robin Appelman2016-06-155-52/+39
| | * | | update icewind/streams to 0.4.1Robin Appelman2016-06-151-0/+0
| * | | | Merge pull request #25132 from owncloud/2fa-load-apps-before-queryVincent Petry2016-06-162-1/+24
| |\ \ \ \
| | * | | | assert app is loaded in unit testsChristoph Wurst2016-06-161-0/+7
| | * | | | load 2FA provider apps before querying classesChristoph Wurst2016-06-162-1/+17
| * | | | | Merge pull request #25146 from owncloud/butonic-patch-1Vincent Petry2016-06-161-1/+1
| |\ \ \ \ \
| | * | | | | emit correct signal when disabling an appJörn Friedrich Dreyer2016-06-161-1/+1
| * | | | | | Merge pull request #25147 from owncloud/setup-advanced-toggleVincent Petry2016-06-161-1/+2
| |\ \ \ \ \ \
| | * | | | | | Prevent the advanced options toggle in the setup from acting as a linkRobin Appelman2016-06-161-1/+2
| * | | | | | | Move birthday calendar generation to a live migration job (#25135)Thomas Müller2016-06-165-66/+84
| * | | | | | | Merge pull request #25104 from owncloud/dropbox-catchratelimitVincent Petry2016-06-161-0/+5
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Convert Dropbox Forbidden exception to StorageNotAvailableExceptionVincent Petry2016-06-141-0/+5
| * | | | | | | Merge pull request #25142 from owncloud/fix-grouped-inputsVincent Petry2016-06-161-13/+13
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | fix grouped input fields, make sure they take precedenceJan-Christoph Borchardt2016-06-161-13/+13
| * | | | | | | Merge pull request #25103 from owncloud/fed-share-disable-cleanfolderVincent Petry2016-06-162-1/+43
| |\ \ \ \ \ \ \
| | * | | | | | | disable cleanFolder for the federated share storageRobin Appelman2016-06-142-1/+43
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge pull request #24252 from owncloud/integration_test_favoritesVincent Petry2016-06-162-2/+90
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-06 12:30:18 +0000