aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1178 from nextcloud/theming-spinner-animationJoas Schilling2016-08-302-8/+19
|\
| * Theming: Show loading spinner while uploading filesJulius Haertl2016-08-302-8/+19
* | Merge pull request #988 from nextcloud/ocs_federationMorris Jobke2016-08-303-64/+82
|\ \
| * | Use function parametersRoeland Jago Douma2016-08-282-17/+8
| * | Move OCSAuthAPI to AppFrameworkRoeland Jago Douma2016-08-283-49/+76
* | | Merge pull request #974 from nextcloud/move_ocs_routes_to_fedfilesharingMorris Jobke2016-08-305-165/+162
|\ \ \
| * | | Move federated sharing routes to the federatedfilesharingappRoeland Jago Douma2016-08-285-165/+162
* | | | Merge pull request #1160 from nextcloud/downstream-25823Roeland Jago Douma2016-08-301-1/+5
|\ \ \ \
| * | | | use correct OCP\DefaultsJörn Friedrich Dreyer2016-08-291-1/+1
| * | | | Include "Product Name" in status.php printoutmartin.mattel@diemattels.at2016-08-291-1/+5
| |/ / /
* | | | Merge pull request #1172 from nextcloud/core_cleanupMorris Jobke2016-08-309-79/+53
|\ \ \ \
| * | | | AvatarController use proper JSONResponseRoeland Jago Douma2016-08-292-45/+36
| * | | | Minor cleanup in core ControllersRoeland Jago Douma2016-08-295-17/+14
| * | | | UserController does not require DefaultsRoeland Jago Douma2016-08-292-17/+3
* | | | | Merge pull request #891 from nextcloud/us_25810Morris Jobke2016-08-302-45/+216
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Improve regexp to detect duplicate folders when repairing unmerged sharesVincent Petry2016-08-172-42/+74
| * | | | Fix unmerged shares repair with mixed group and direct sharesVincent Petry2016-08-172-4/+57
| * | | | Improve file_target finding logic when repairing unmerged sharesVincent Petry2016-08-172-10/+96
* | | | | Merge pull request #1132 from nextcloud/prevent-parse-error-on-editing-an-htm...blizzz2016-08-301-1/+1
|\ \ \ \ \
| * | | | | Prevent parse error on editing an HTML commentJoas Schilling2016-08-291-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #1169 from nextcloud/2fa-single-providerLukas Reschke2016-08-292-5/+93
|\ \ \ \ \
| * | | | | redirect to 2fa provider if there's only one active for the userChristoph Wurst2016-08-292-5/+93
* | | | | | Merge pull request #1170 from nextcloud/theming-fix-primary-buttonLukas Reschke2016-08-292-35/+77
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Theming: fix primary button for bright colorsJulius Haertl2016-08-292-35/+77
| |/ / / /
* | | | | Merge pull request #1130 from nextcloud/shared-upload-quotaRoeland Jago Douma2016-08-292-0/+28
|\ \ \ \ \
| * | | | | A shared storage is never a home storage - fixes #25582Thomas Müller2016-08-291-0/+10
| * | | | | Added integration testSergio Bertolin2016-08-291-0/+18
| | |/ / / | |/| | |
* | | | | Merge pull request #1147 from nextcloud/files-hidden-files-summaryRoeland Jago Douma2016-08-294-52/+230
|\ \ \ \ \
| * | | | | Display number of hidden files in files summary (#25870)Vincent Petry2016-08-294-52/+230
| |/ / / /
* | | | | Merge pull request #1146 from nextcloud/init-filesconfigRoeland Jago Douma2016-08-291-0/+4
|\ \ \ \ \
| * | | | | Make sure file list files config always existsVincent Petry2016-08-291-0/+4
| |/ / / /
* | | | | Merge pull request #1148 from nextcloud/files-scan-reconnect-database-before-...Roeland Jago Douma2016-08-291-1/+26
|\ \ \ \ \
| * | | | | Before a user is getting scanned the database connection is re-establishedThomas Müller2016-08-291-1/+26
| |/ / / /
* | | | | Merge pull request #1145 from nextcloud/upstream-25794Roeland Jago Douma2016-08-292-9/+6
|\ \ \ \ \
| * | | | | [master] DAV: Return data-fingerprint always when asked (#25482)Markus Goetz2016-08-292-9/+6
| |/ / / /
* | | | | Merge pull request #1142 from nextcloud/fix-case-sensitive-settingsRoeland Jago Douma2016-08-291-0/+10
|\ \ \ \ \
| * | | | | Fix issues where some user settings cannot be loaded when the user id differs...Thomas Müller2016-08-291-0/+10
| |/ / / /
* | | | | Merge pull request #1139 from nextcloud/clean-code-imageRoeland Jago Douma2016-08-291-15/+11
|\ \ \ \ \
| * | | | | Some cleanup within OC_Image (#25875)Thomas Müller2016-08-291-15/+11
| |/ / / /
* | | | | Merge pull request #1115 from nextcloud/fix_146Christoph Wurst2016-08-291-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Link 'Allow editing' => 'Allow upload and editing'Roeland Jago Douma2016-08-281-1/+1
| |/ / /
* | | | Merge pull request #1136 from nextcloud/fix-16041Joas Schilling2016-08-291-0/+2
|\ \ \ \
| * | | | Modified overflow in multiselectorSergio Bertolín2016-08-291-0/+2
| |/ / /
* | | | Merge pull request #1135 from nextcloud/choose-buttonsJoas Schilling2016-08-291-0/+14
|\ \ \ \
| * | | | Choose button remains disabled unless files are chosenSujith Haridasan2016-08-291-0/+14
| |/ / /
* | | | Merge pull request #1134 from nextcloud/fix_redirectionJoas Schilling2016-08-291-1/+1
|\ \ \ \
| * | | | Fix redirection taking care of protocol and portJuan Pablo Villafáñez2016-08-291-1/+1
| |/ / /
* | | | Merge pull request #1133 from nextcloud/fix-numerousJoas Schilling2016-08-292-33/+19
|\ \ \ \
| * | | | always return numeric storage id as int, also check type equality in test ass...Jörn Friedrich Dreyer2016-08-292-33/+19
| |/ / /
* | | | Merge pull request #1131 from nextcloud/add-paddingJoas Schilling2016-08-291-1/+2
|\ \ \ \