summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #214 from floeschie/masterMarius Blüm2016-06-241-1/+1
|\ | | | | Replace occurence of "ownCloud" by "Nextcloud"
| * Replace occurences of "ownCloud" by "Nextcloud"Florian Auer2016-06-241-1/+1
|/
* Merge pull request #208 from nextcloud/drag-accept-icon-for-emptycontentWilliam Bargent2016-06-231-1/+2
|\ | | | | changes emptycontent icon to drag-accept on file-drag
| * changes emptycontent icon to drag-accept on file-dragVincent Chan2016-06-231-1/+2
|/
* Merge pull request #204 from JSoko/masterMorris Jobke2016-06-226-22/+22
|\ | | | | de language files changed to Nextcloud
| * to NextcloudJoachim Sokolowski2016-06-226-22/+22
| |
| * Merge remote-tracking branch 'refs/remotes/origin/master' into nextcloud/masterJoachim Sokolowski2016-06-220-0/+0
|/|
| * Merge remote-tracking branch 'refs/remotes/nextcloud/master'Joachim Sokolowski2016-06-220-0/+0
| |\
* | \ Merge pull request #201 from nextcloud/followup-to-196Lukas Reschke2016-06-2288-88/+88
|\ \ \ | | | | | | | | Fix translation strings
| * | | Fix translation stringsMorris Jobke2016-06-2288-88/+88
|/ / /
* | | Merge pull request #196 from JSoko/patch-2Morris Jobke2016-06-221-1/+1
|\ \ \ | |_|/ |/| | singleuser.user.php -> nextcloud
| * | singleuser.user.php -> nextcloudJoachim Sokolowski2016-06-221-1/+1
| | | | | | | | | Changed to nextcloud
* | | Merge pull request #197 from JSoko/masterMorris Jobke2016-06-223-15/+15
|\ \ \ | |/ / |/| / | |/ changed to nextcloud
| * some text-changes to nextcloudJoachim Sokolowski2016-06-221-13/+13
| |
| * changed to nextcloudJoachim Sokolowski2016-06-221-1/+1
| |
| * nextcloud serverJoachim Sokolowski2016-06-221-1/+1
| | | | | | | | nextcloud server
| * Merge remote-tracking branch 'refs/remotes/nextcloud/master'Joachim Sokolowski2016-06-221-6/+6
| |\ | |/ |/|
* | Merge pull request #194 from JSoko/patch-1Marius Blüm2016-06-221-6/+6
|\ \ | |/ |/| default.php for nextcloud themes example
| * default.php for nextcloudJoachim Sokolowski2016-06-211-6/+6
|/ | | changing it to nextcloud
* Merge pull request #191 from nextcloud/ci-postgresLukas Reschke2016-06-212-1/+15
|\ | | | | Add postgres to CI
| * Add postgres to CIMorris Jobke2016-06-212-1/+15
| |
* | Merge pull request #188 from nextcloud/add-wndLukas Reschke2016-06-219-3/+282
|\ \ | |/ |/| Add "Global Auth" option to external storage
| * Add "Global Auth" option to external storageRobin Appelman2016-06-219-3/+282
|/ | | | | | | | This adds the "Global Auth" option to the external storage implementation, it is basically done by reverting c2c6caee93c491de9fa9a2e7c2eea036f4974e61 from https://github.com/owncloud/core/pull/22468. This was taken from owncloud/core which is AGPL licensed. Commited with "icewind@owncloud.com" to keep the license header signature in sync. ![2016-06-21_14-01-06](https://cloud.githubusercontent.com/assets/878997/16228662/9c243136-37b8-11e6-9700-c1076ddb3d17.png)
* Merge pull request #185 from nextcloud/fix-permission-issueLukas Reschke2016-06-211-3/+3
|\ | | | | Show error message if config file is not readable
| * Show error message if config file is not readableMorris Jobke2016-06-211-3/+3
| | | | | | | | | | | | * when the config file is not writable there is a error message shown * same happens now if the config file is not readable * fixes #180
* | Merge pull request #186 from nextcloud/master-sync-upstreamLukas Reschke2016-06-21142-262/+1721
|\ \ | |/ |/| [master] sync upstream - 21.06.2016
| * 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 issues
| | * Fix conversion issuesJuan Pablo Villafáñez2016-06-204-0/+6
| | | | | | | | | | | | Change to phpdoc type for automatic conversion
| * | Merge pull request #25162 from owncloud/password-login-forbidden-hintVincent Petry2016-06-208-28/+176
| |\ \ | | | | | | | | Password login forbidden hint
| | * | PasswordLoginForbidden must extend NotAuthenticatedVincent Petry2016-06-171-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 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 registerMountProviders
| | * | | Delay files_sharing's registerMountProvidersVincent Petry2016-06-171-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üller2016-06-201-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-testsVincent Petry2016-06-201-2/+2
| |\ \ \ \ | | | | | | | | | | | | Fix GDrive test rename overwrite folder
| | * | | | 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 FS
| | * | | | | 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
| | * | | | | files_external: Keep checkbox and its label on one line #20032 #22655Markus Goetz2016-06-172-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-cursorVincent Petry2016-06-201-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | close cursor after loading a token
| | * | | | | 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 config
| | * | | | | Capped cache for user configJörn Friedrich Dreyer2016-06-171-2/+4
| | | |/ / / | | |/| | |
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-2016-4/+130
| | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-31 05:53:21 +0000