Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | more efficient check if addressbook and calendar exists for user | Robin Appelman | 2016-08-31 | 6 | -16/+49 |
| | |||||
* | Merge pull request #1202 from nextcloud/remove_polyfills_for_55_56 | Roeland Jago Douma | 2016-08-31 | 1 | -0/+0 |
|\ | | | | | Remove 3rdparty for polyfills for php5.4 and php5.5 | ||||
| * | Update third-party reference | Lukas Reschke | 2016-08-31 | 1 | -0/+0 |
| | | |||||
| * | Remove 3rdparty for polyfills for php5.4 and php5.5 | Roeland Jago Douma | 2016-08-31 | 1 | -0/+0 |
| | | |||||
* | | Merge pull request #1137 from nextcloud/external_storage_lnk | Lukas Reschke | 2016-08-31 | 1 | -1/+1 |
|\ \ | | | | | | | External storage lnk | ||||
| * | | add in files view a link to personal files external | davitol | 2016-08-29 | 1 | -1/+0 |
| | | | |||||
| * | | add link to personal files external | davitol | 2016-08-29 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #1196 from ↵ | Lukas Reschke | 2016-08-31 | 4 | -6/+72 |
|\ \ \ | |_|/ |/| | | | | | | | | nextcloud/oc-integration_tests_local_external_storage Integration test on a local storage | ||||
| * | | Use "testing" instead of "user_ldap" as test app | Lukas Reschke | 2016-08-31 | 1 | -6/+6 |
| | | | |||||
| * | | Creating the folder when the tests run | Sergio Bertolín | 2016-08-30 | 3 | -7/+4 |
| | | | |||||
| * | | Changed enabled/disabled app in provisioning api tests | Sergio Bertolín | 2016-08-30 | 1 | -6/+7 |
| | | | |||||
| * | | External storage was not enabled and content was not deleted before scenarios | Sergio Bertolín | 2016-08-30 | 2 | -1/+19 |
| | | | |||||
| * | | Added local_storage folder | Sergio Bertolín | 2016-08-30 | 1 | -0/+4 |
| | | | |||||
| * | | Run as current user | Sergio Bertolin | 2016-08-30 | 1 | -5/+3 |
| | | | |||||
| * | | Removed extra context added needed option and remove storage after external ↵ | Sergio Bertolin | 2016-08-30 | 5 | -26/+15 |
| | | | | | | | | | | | | storage scenarios | ||||
| * | | Added feature and context, not working yet, option to allow sharing needs to ↵ | Sergio Bertolin | 2016-08-30 | 2 | -0/+50 |
| | | | | | | | | | | | | be added | ||||
| * | | Modified run.sh to mount a local storage | Sergio Bertolin | 2016-08-30 | 2 | -0/+9 |
| | | | |||||
* | | | Merge pull request #1189 from nextcloud/share-allowspaceinremote | Lukas Reschke | 2016-08-30 | 2 | -1/+53 |
|\ \ \ | | | | | | | | | Allow space for federated share id search | ||||
| * | | | Allow space for federated share id search | Vincent Petry | 2016-08-30 | 2 | -1/+53 |
| | | | | |||||
* | | | | Merge pull request #1198 from nextcloud/php56-and-70-only | Lukas Reschke | 2016-08-30 | 3 | -37/+9 |
|\ \ \ \ | | | | | | | | | | | Exclude older PHP versions from .travis.yml | ||||
| * | | | | Proper branding | Lukas Reschke | 2016-08-30 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Show error if PHP version below 5.6 is used | Lukas Reschke | 2016-08-30 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | Execute only tests for modern PHP versions | Lukas Reschke | 2016-08-30 | 1 | -24/+0 |
| | | | | | |||||
| * | | | | Exclude older PHP versions from .travis.yml | Lukas Reschke | 2016-08-30 | 1 | -9/+5 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #1087 from nextcloud/get-delay-twice | Lukas Reschke | 2016-08-30 | 3 | -9/+11 |
|\ \ \ \ | | | | | | | | | | | dont get bruteforce delay twice | ||||
| * | | | | dont get bruteforce delay twice | Robin Appelman | 2016-08-29 | 3 | -9/+11 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #1195 from nextcloud/heartbeat-short-circuit | Lukas Reschke | 2016-08-30 | 1 | -0/+3 |
|\ \ \ \ | |_|/ / |/| | | | Short circuit processing of the heartbeat request | ||||
| * | | | Short circuit processing of the heartbeat request | Robin Appelman | 2016-08-30 | 1 | -0/+3 |
| | | | | |||||
* | | | | Merge pull request #1190 from ↵ | Morris Jobke | 2016-08-30 | 2 | -2/+105 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | nextcloud/addressbook-correctly-handle-multi-values Correctly handle multi-values when converting VCards to array | ||||
| * | | | Add a unit test for all the magic | Joas Schilling | 2016-08-30 | 1 | -1/+64 |
| | | | | |||||
| * | | | Correctly handle multi-values when converting VCards to array | Joas Schilling | 2016-08-30 | 1 | -1/+41 |
| | | | | |||||
* | | | | Merge pull request #1187 from nextcloud/danysz-master | Joas Schilling | 2016-08-30 | 2 | -0/+6 |
|\ \ \ \ | | | | | | | | | | | Update the mime types with the relevant types for "apple-iWorks" | ||||
| * | | | | update to proper icons and run occ command to update JS file | Morris Jobke | 2016-08-30 | 2 | -3/+6 |
| | | | | | |||||
| * | | | | Update the mime types with the relevant types for "apple-iWorks" (pages, ↵ | Daniel Szasz | 2016-08-30 | 1 | -0/+3 |
| | |_|/ | |/| | | | | | | | | | | numbers, keynote). Now the files are treated like a file when are in "Single file" mode. | ||||
* | | | | Merge pull request #1089 from nextcloud/allow-to-prevent-previews | Roeland Jago Douma | 2016-08-30 | 2 | -1/+3 |
|\ \ \ \ | | | | | | | | | | | Check if the file isReadable() before sending a (cached) preview | ||||
| * | | | | Check if the file isReadable() before sending a (cached) preview | Joas Schilling | 2016-08-29 | 2 | -1/+3 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #1138 from nextcloud/expiry-as-occ-command | Roeland Jago Douma | 2016-08-30 | 4 | -0/+263 |
|\ \ \ \ | |_|/ / |/| | | | Add occ command to expire the trashbin (#25878) | ||||
| * | | | Add occ command to expire the trashbin (#25878) | Thomas Müller | 2016-08-29 | 4 | -0/+263 |
| |/ / | | | | | | | | | | | | | | | | * Add occ command to expire the trashbin * Fix versions folder in setup check | ||||
* | | | 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 |