| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #1178 from nextcloud/theming-spinner-animation | Joas Schilling | 2016-08-30 | 2 | -8/+19 |
| |\ | | | | | Theming: Show loading spinner while uploading files | ||||
| | * | Theming: Show loading spinner while uploading files | Julius Haertl | 2016-08-30 | 2 | -8/+19 |
| | | | |||||
| * | | Merge pull request #988 from nextcloud/ocs_federation | Morris Jobke | 2016-08-30 | 3 | -64/+82 |
| |\ \ | | | | | | | Move OCSAuthAPI to AppFramework | ||||
| | * | | Use function parameters | Roeland Jago Douma | 2016-08-28 | 2 | -17/+8 |
| | | | | |||||
| | * | | Move OCSAuthAPI to AppFramework | Roeland Jago Douma | 2016-08-28 | 3 | -49/+76 |
| | | | | | | | | | | | | | | | | | | | * Convert class * Convert routes * Convert tests | ||||
| * | | | Merge pull request #974 from nextcloud/move_ocs_routes_to_fedfilesharing | Morris Jobke | 2016-08-30 | 5 | -165/+162 |
| |\ \ \ | | | | | | | | | Move federated sharing routes to the federatedfilesharing app | ||||
| | * | | | Move federated sharing routes to the federatedfilesharingapp | Roeland Jago Douma | 2016-08-28 | 5 | -165/+162 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Move routes to app * Move routes over to the AppFramework * Fix tests There is plenty of stuff to fix properly here. But out of scope for now. | ||||
| * | | | | Merge pull request #1160 from nextcloud/downstream-25823 | Roeland Jago Douma | 2016-08-30 | 1 | -1/+5 |
| |\ \ \ \ | | | | | | | | | | | Include "Product Name" in status.php printout | ||||
| | * | | | | use correct OCP\Defaults | Jörn Friedrich Dreyer | 2016-08-29 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Include "Product Name" in status.php printout | martin.mattel@diemattels.at | 2016-08-29 | 1 | -1/+5 |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | identifyer -> identifier removed variable | ||||
| * | | | | Merge pull request #1172 from nextcloud/core_cleanup | Morris Jobke | 2016-08-30 | 9 | -79/+53 |
| |\ \ \ \ | | | | | | | | | | | Core controller cleanup | ||||
| | * | | | | AvatarController use proper JSONResponse | Roeland Jago Douma | 2016-08-29 | 2 | -45/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | * Do not rely on DataResponse magic. We want JSON so use JSON * Fix tests | ||||
| | * | | | | Minor cleanup in core Controllers | Roeland Jago Douma | 2016-08-29 | 5 | -17/+14 |
| | | | | | | |||||
| | * | | | | UserController does not require Defaults | Roeland Jago Douma | 2016-08-29 | 2 | -17/+3 |
| | | | | | | |||||
| * | | | | | Merge pull request #891 from nextcloud/us_25810 | Morris Jobke | 2016-08-30 | 2 | -45/+216 |
| |\ \ \ \ \ | |_|_|_|/ |/| | | | | [OC] Fix unmerged shares repair targetdecision | ||||
| | * | | | | Improve regexp to detect duplicate folders when repairing unmerged shares | Vincent Petry | 2016-08-17 | 2 | -42/+74 |
| | | | | | | |||||
| | * | | | | Fix unmerged shares repair with mixed group and direct shares | Vincent Petry | 2016-08-17 | 2 | -4/+57 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever a group share is created after a direct share, the stime order needs to be properly considered in the repair routine, considering that the direct user share is appended to the $subShares array and breaking its order. | ||||
| | * | | | | Improve file_target finding logic when repairing unmerged shares | Vincent Petry | 2016-08-17 | 2 | -10/+96 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pick the most recent subshare that has no parenthesis from duplication which should match whichever name the user picked last. If all subshares have duplicate parenthesis names, use the least recent group share's target instead. | ||||
| * | | | | | Merge pull request #1132 from ↵ | blizzz | 2016-08-30 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/prevent-parse-error-on-editing-an-html-comment Prevent parse error on editing an HTML comment | ||||
| | * | | | | | Prevent parse error on editing an HTML comment | Joas Schilling | 2016-08-29 | 1 | -1/+1 |
| | | |_|/ / | |/| | | | |||||
| * | | | | | Merge pull request #1169 from nextcloud/2fa-single-provider | Lukas Reschke | 2016-08-29 | 2 | -5/+93 |
| |\ \ \ \ \ | | | | | | | | | | | | | redirect to 2fa provider if there's only one active for the user | ||||
| | * | | | | | redirect to 2fa provider if there's only one active for the user | Christoph Wurst | 2016-08-29 | 2 | -5/+93 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #1170 from nextcloud/theming-fix-primary-button | Lukas Reschke | 2016-08-29 | 2 | -35/+77 |
| |\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Theming: fix primary button for bright colors | ||||
| | * | | | | | Theming: fix primary button for bright colors | Julius Haertl | 2016-08-29 | 2 | -35/+77 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #1130 from nextcloud/shared-upload-quota | Roeland Jago Douma | 2016-08-29 | 2 | -0/+28 |
| |\ \ \ \ \ | | | | | | | | | | | | | [uc] Fix uploading to shared folder with quota | ||||
| | * | | | | | A shared storage is never a home storage - fixes #25582 | Thomas Müller | 2016-08-29 | 1 | -0/+10 |
| | | | | | | | |||||
| | * | | | | | Added integration test | Sergio Bertolin | 2016-08-29 | 1 | -0/+18 |
| | | |/ / / | |/| | | | |||||
| * | | | | | Merge pull request #1147 from nextcloud/files-hidden-files-summary | Roeland Jago Douma | 2016-08-29 | 4 | -52/+230 |
| |\ \ \ \ \ | | | | | | | | | | | | | Display number of hidden files in files summary (#25870) | ||||
| | * | | | | | Display number of hidden files in files summary (#25870) | Vincent Petry | 2016-08-29 | 4 | -52/+230 |
| | |/ / / / | | | | | | | | | | | | | | | | When dot files are hidden, the table summary and selection summary will not show how many hidden files were included. | ||||
| * | | | | | Merge pull request #1146 from nextcloud/init-filesconfig | Roeland Jago Douma | 2016-08-29 | 1 | -0/+4 |
| |\ \ \ \ \ | | | | | | | | | | | | | Make sure file list files config always exists | ||||
| | * | | | | | Make sure file list files config always exists | Vincent Petry | 2016-08-29 | 1 | -0/+4 |
| | |/ / / / | | | | | | | | | | | | | | | | Initialize files config with defaults in case none was passed | ||||
| * | | | | | Merge pull request #1148 from ↵ | Roeland Jago Douma | 2016-08-29 | 1 | -1/+26 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/files-scan-reconnect-database-before-each-user-master Before a user is getting scanned the database connection is re-establ… | ||||
| | * | | | | | Before a user is getting scanned the database connection is re-established | Thomas Müller | 2016-08-29 | 1 | -1/+26 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #1145 from nextcloud/upstream-25794 | Roeland Jago Douma | 2016-08-29 | 2 | -9/+6 |
| |\ \ \ \ \ | | | | | | | | | | | | | DAV: Return data-fingerprint always when asked | ||||
| | * | | | | | [master] DAV: Return data-fingerprint always when asked (#25482) | Markus Goetz | 2016-08-29 | 2 | -9/+6 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For owncloud/client#5056 Users can configure arbitrary subfolders for syncing, therefore we should always return it when asked for. The sync client makes sure to not always ask for it to save bandwidth. | ||||
| * | | | | | Merge pull request #1142 from nextcloud/fix-case-sensitive-settings | Roeland Jago Douma | 2016-08-29 | 1 | -0/+10 |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix issues where some user settings cannot be loaded when the user id… | ||||
| | * | | | | | Fix issues where some user settings cannot be loaded when the user id ↵ | Thomas Müller | 2016-08-29 | 1 | -0/+10 |
| | |/ / / / | | | | | | | | | | | | | | | | differs in case sensitivity - fixes #25684 (#25686) | ||||
| * | | | | | Merge pull request #1139 from nextcloud/clean-code-image | Roeland Jago Douma | 2016-08-29 | 1 | -15/+11 |
| |\ \ \ \ \ | | | | | | | | | | | | | Some cleanup within OC_Image (#25875) | ||||
| | * | | | | | Some cleanup within OC_Image (#25875) | Thomas Müller | 2016-08-29 | 1 | -15/+11 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #1115 from nextcloud/fix_146 | Christoph Wurst | 2016-08-29 | 1 | -1/+1 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | Link 'Allow editing' => 'Allow upload and editing' | ||||
| | * | | | | Link 'Allow editing' => 'Allow upload and editing' | Roeland Jago Douma | 2016-08-28 | 1 | -1/+1 |
| | |/ / / | | | | | | | | | | | | | Fixes #146 | ||||
| * | | | | Merge pull request #1136 from nextcloud/fix-16041 | Joas Schilling | 2016-08-29 | 1 | -0/+2 |
| |\ \ \ \ | | | | | | | | | | | Modified overflow in multiselector | ||||
| | * | | | | Modified overflow in multiselector | Sergio Bertolín | 2016-08-29 | 1 | -0/+2 |
| | |/ / / | |||||
| * | | | | Merge pull request #1135 from nextcloud/choose-buttons | Joas Schilling | 2016-08-29 | 1 | -0/+14 |
| |\ \ \ \ | | | | | | | | | | | Choose button remains disabled unless files are chosen | ||||
| | * | | | | Choose button remains disabled unless files are chosen | Sujith Haridasan | 2016-08-29 | 1 | -0/+14 |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from filepicker This is will help user to understand that you can only click choose button once the files are selected from the file picker. This addresses the solution for issue 16106 Signed-off-by: Sujith Haridasan <Sujith_Haridasan@mentor.com> | ||||
| * | | | | Merge pull request #1134 from nextcloud/fix_redirection | Joas Schilling | 2016-08-29 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | Fix redirection taking care of protocol and port | ||||
| | * | | | | Fix redirection taking care of protocol and port | Juan Pablo Villafáñez | 2016-08-29 | 1 | -1/+1 |
| | |/ / / | |||||
| * | | | | Merge pull request #1133 from nextcloud/fix-numerous | Joas Schilling | 2016-08-29 | 2 | -33/+19 |
| |\ \ \ \ | | | | | | | | | | | always return numeric storage id as int, also check type equality in … | ||||
| | * | | | | always return numeric storage id as int, also check type equality in test ↵ | Jörn Friedrich Dreyer | 2016-08-29 | 2 | -33/+19 |
| | |/ / / | | | | | | | | | | | | | asserts | ||||
| * | | | | Merge pull request #1131 from nextcloud/add-padding | Joas Schilling | 2016-08-29 | 1 | -1/+2 |
| |\ \ \ \ | | | | | | | | | | | Adds padding and max-width to the input for the sign up page. (#25959) | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| aboutsummaryrefslogtreecommitdiffstats |