Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Catch exceptions while creating shared mounts (#25077) | Robin Appelman | 2016-06-20 | 2 | -11/+25 |
| | |||||
* | Don't send activity to non-admins when assigning invisible tags (#25192) | Vincent Petry | 2016-06-20 | 1 | -0/+4 |
| | |||||
* | Merge pull request #25173 from owncloud/fix_conversion_issues | Vincent Petry | 2016-06-20 | 4 | -0/+6 |
|\ | | | | | Fix conversion issues | ||||
| * | Fix conversion issues | Juan Pablo Villafáñez | 2016-06-20 | 4 | -0/+6 |
| | | | | | | | | Change to phpdoc type for automatic conversion | ||||
* | | Merge pull request #25162 from owncloud/password-login-forbidden-hint | Vincent Petry | 2016-06-20 | 8 | -28/+176 |
|\ \ | | | | | | | Password login forbidden hint | ||||
| * | | PasswordLoginForbidden must extend NotAuthenticated | Vincent Petry | 2016-06-17 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | The auth code from Sabre will forward NotAuthenticated exceptions but in the case of a generic exception, it is packaged as "service not available". | ||||
| * | | throw PasswordLoginForbidden on DAV | Christoph Wurst | 2016-06-17 | 3 | -3/+60 |
| | | | |||||
| * | | add PasswordLoginForbiddenException | Christoph Wurst | 2016-06-17 | 7 | -27/+118 |
| | | | |||||
* | | | Merge pull request #25159 from owncloud/share-app-initorder | Vincent Petry | 2016-06-20 | 1 | -3/+3 |
|\ \ \ | | | | | | | | | Delay files_sharing's registerMountProviders | ||||
| * | | | Delay files_sharing's registerMountProviders | Vincent Petry | 2016-06-17 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves registerMountProviders until after the sharing backends were registered. In some situations registerMountProviders will trigger listeners which might require filesystem access which itself would mount shares, which itself requires the sharing backends to be initialized. | ||||
* | | | | Update ExcludeFileByNameFilterIterator.php (#25184) | Thomas Müller | 2016-06-20 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | Gentoo & derivatives use a tool named webapp-config which places two files in a webapp-config manager web application: 1: .webapp tag with more detailed info on the configuration done by webapp-config 2: .webapp-appname with the list of files installed by the tool to be able to later only delete stuff that was installed (in case of upgrade) and updated configurations. | ||||
* | | | | Merge pull request #25010 from owncloud/gdrive-fix-tests | Vincent Petry | 2016-06-20 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Fix GDrive test rename overwrite folder | ||||
| * | | | | Fix GDrive test rename overwrite folder | Vincent Petry | 2016-06-10 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge pull request #25161 from owncloud/fixgetsharefolder | Vincent Petry | 2016-06-20 | 2 | -5/+9 |
|\ \ \ \ \ | | | | | | | | | | | | | Make getShareFolder use given view instead of static FS | ||||
| * | | | | | Make getShareFolder use given view instead of static FS | Vincent Petry | 2016-06-17 | 2 | -5/+9 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #25120 from owncloud/settings_fix_checkbox_newline | Vincent Petry | 2016-06-20 | 2 | -3/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | files_external: Keep checkbox and its label on one line | ||||
| * | | | | | files_external: Keep checkbox and its label on one line #20032 #22655 | Markus Goetz | 2016-06-17 | 2 | -3/+7 |
| | |_|_|/ | |/| | | | | | | | | | | | | | Else the checkbox and the decription end up on different lines in my Chrome on OS X | ||||
* | | | | | Merge pull request #25174 from owncloud/tokenmapper-close-cursor | Vincent Petry | 2016-06-20 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | close cursor after loading a token | ||||
| * | | | | | close cursor after loading a token | Christoph Wurst | 2016-06-17 | 1 | -0/+1 |
| |/ / / / | |||||
* | | | | | Merge pull request #25168 from owncloud/capped-user-cache | Vincent Petry | 2016-06-20 | 1 | -2/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | Capped cache for user config | ||||
| * | | | | | Capped cache for user config | Jörn Friedrich Dreyer | 2016-06-17 | 1 | -2/+4 |
| | |/ / / | |/| | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-20 | 16 | -4/+130 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-18 | 4 | -2/+68 |
| | | | | | |||||
* | | | | | Merge pull request #25158 from owncloud/removerootshares-delaygetrootfolder | Vincent Petry | 2016-06-17 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Delay getRootFolder from RemoveRootShares repair step | ||||
| * | | | | Use getLazyRootFolder from RemoveRootShares repair step | Vincent Petry | 2016-06-17 | 1 | -1/+1 |
| |/ / / | | | | | | | | | | | | | | | | | This prevents the command registration to setup the FS too early when FS-related apps might need upgrading. | ||||
* | | | | Added test with new endpoint (#23934) | Sergio Bertolín | 2016-06-17 | 2 | -37/+55 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added test with new endpoint * Moved all scenarios using new dav endpoint to a new feature file * Removed extra slash in welcome.txt * some fixes * Incorrect user while downloading with range * Fixed Content-disposition | ||||
* | | | | Merge pull request #25153 from owncloud/fix-problem-added-in-25023 | Vincent Petry | 2016-06-17 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | Changed global variable to local | ||||
| * | | | Changed global variable to local | Sergio Bertolín | 2016-06-17 | 1 | -1/+1 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-17 | 28 | -6/+176 |
| | | | |||||
* | | | Merge pull request #24965 from owncloud/streams-0.4.1 | Vincent Petry | 2016-06-16 | 6 | -52/+39 |
|\ \ \ | | | | | | | | | update icewind/streams to 0.4.1 | ||||
| * | | | Update submodule for 3rdparty icewind/streams update | Vincent Petry | 2016-06-16 | 1 | -0/+0 |
| | | | | |||||
| * | | | update icewind/streams to 0.4.1 | Robin Appelman | 2016-06-15 | 5 | -52/+39 |
| | | | | |||||
| * | | | update icewind/streams to 0.4.1 | Robin Appelman | 2016-06-15 | 1 | -0/+0 |
| | | | | |||||
* | | | | Merge pull request #25132 from owncloud/2fa-load-apps-before-query | Vincent Petry | 2016-06-16 | 2 | -1/+24 |
|\ \ \ \ | | | | | | | | | | | load 2FA provider apps before querying classes | ||||
| * | | | | assert app is loaded in unit tests | Christoph Wurst | 2016-06-16 | 1 | -0/+7 |
| | | | | | |||||
| * | | | | load 2FA provider apps before querying classes | Christoph Wurst | 2016-06-16 | 2 | -1/+17 |
| | | | | | |||||
* | | | | | Merge pull request #25146 from owncloud/butonic-patch-1 | Vincent Petry | 2016-06-16 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | emit correct signal when disabling an app | ||||
| * | | | | | emit correct signal when disabling an app | Jörn Friedrich Dreyer | 2016-06-16 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #25147 from owncloud/setup-advanced-toggle | Vincent Petry | 2016-06-16 | 1 | -1/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Prevent the advanced options toggle in the setup from acting as a link | ||||
| * | | | | | | Prevent the advanced options toggle in the setup from acting as a link | Robin Appelman | 2016-06-16 | 1 | -1/+2 |
| | | | | | | | |||||
* | | | | | | | Move birthday calendar generation to a live migration job (#25135) | Thomas Müller | 2016-06-16 | 5 | -66/+84 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #25104 from owncloud/dropbox-catchratelimit | Vincent Petry | 2016-06-16 | 1 | -0/+5 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Convert Dropbox Forbidden exception to StorageNotAvailableException | ||||
| * | | | | | | Convert Dropbox Forbidden exception to StorageNotAvailableException | Vincent Petry | 2016-06-14 | 1 | -0/+5 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #25142 from owncloud/fix-grouped-inputs | Vincent Petry | 2016-06-16 | 1 | -13/+13 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | fix grouped input fields, make sure they take precedence | ||||
| * | | | | | | fix grouped input fields, make sure they take precedence | Jan-Christoph Borchardt | 2016-06-16 | 1 | -13/+13 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #25103 from owncloud/fed-share-disable-cleanfolder | Vincent Petry | 2016-06-16 | 2 | -1/+43 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | disable cleanFolder for the federated share storage | ||||
| * | | | | | | | disable cleanFolder for the federated share storage | Robin Appelman | 2016-06-14 | 2 | -1/+43 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #24252 from owncloud/integration_test_favorites | Vincent Petry | 2016-06-16 | 2 | -2/+90 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Added favorites integration tests | ||||
| * | | | | | | Added unfavoriting tests and some rewording | Sergio Bertolín | 2016-06-15 | 2 | -8/+36 |
| | | | | | | | |||||
| * | | | | | | Fixing the tests | Sergio Bertolín | 2016-06-15 | 2 | -21/+20 |
| | | | | | | |