aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* more efficient check if addressbook and calendar exists for userRobin Appelman2016-08-316-16/+49
|
* Merge pull request #1202 from nextcloud/remove_polyfills_for_55_56Roeland Jago Douma2016-08-311-0/+0
|\ | | | | Remove 3rdparty for polyfills for php5.4 and php5.5
| * Update third-party referenceLukas Reschke2016-08-311-0/+0
| |
| * Remove 3rdparty for polyfills for php5.4 and php5.5Roeland Jago Douma2016-08-311-0/+0
| |
* | Merge pull request #1137 from nextcloud/external_storage_lnkLukas Reschke2016-08-311-1/+1
|\ \ | | | | | | External storage lnk
| * | add in files view a link to personal files externaldavitol2016-08-291-1/+0
| | |
| * | add link to personal files externaldavitol2016-08-291-0/+1
| | |
* | | Merge pull request #1196 from ↵Lukas Reschke2016-08-314-6/+72
|\ \ \ | |_|/ |/| | | | | | | | nextcloud/oc-integration_tests_local_external_storage Integration test on a local storage
| * | Use "testing" instead of "user_ldap" as test appLukas Reschke2016-08-311-6/+6
| | |
| * | Creating the folder when the tests runSergio Bertolín2016-08-303-7/+4
| | |
| * | Changed enabled/disabled app in provisioning api testsSergio Bertolín2016-08-301-6/+7
| | |
| * | External storage was not enabled and content was not deleted before scenariosSergio Bertolín2016-08-302-1/+19
| | |
| * | Added local_storage folderSergio Bertolín2016-08-301-0/+4
| | |
| * | Run as current userSergio Bertolin2016-08-301-5/+3
| | |
| * | Removed extra context added needed option and remove storage after external ↵Sergio Bertolin2016-08-305-26/+15
| | | | | | | | | | | | storage scenarios
| * | Added feature and context, not working yet, option to allow sharing needs to ↵Sergio Bertolin2016-08-302-0/+50
| | | | | | | | | | | | be added
| * | Modified run.sh to mount a local storageSergio Bertolin2016-08-302-0/+9
| | |
* | | Merge pull request #1189 from nextcloud/share-allowspaceinremoteLukas Reschke2016-08-302-1/+53
|\ \ \ | | | | | | | | Allow space for federated share id search
| * | | Allow space for federated share id searchVincent Petry2016-08-302-1/+53
| | | |
* | | | Merge pull request #1198 from nextcloud/php56-and-70-onlyLukas Reschke2016-08-303-37/+9
|\ \ \ \ | | | | | | | | | | Exclude older PHP versions from .travis.yml
| * | | | Proper brandingLukas Reschke2016-08-301-1/+1
| | | | |
| * | | | Show error if PHP version below 5.6 is usedLukas Reschke2016-08-301-4/+4
| | | | |
| * | | | Execute only tests for modern PHP versionsLukas Reschke2016-08-301-24/+0
| | | | |
| * | | | Exclude older PHP versions from .travis.ymlLukas Reschke2016-08-301-9/+5
| | |/ / | |/| |
* | | | Merge pull request #1087 from nextcloud/get-delay-twiceLukas Reschke2016-08-303-9/+11
|\ \ \ \ | | | | | | | | | | dont get bruteforce delay twice
| * | | | dont get bruteforce delay twiceRobin Appelman2016-08-293-9/+11
| | |_|/ | |/| |
* | | | Merge pull request #1195 from nextcloud/heartbeat-short-circuitLukas Reschke2016-08-301-0/+3
|\ \ \ \ | |_|/ / |/| | | Short circuit processing of the heartbeat request
| * | | Short circuit processing of the heartbeat requestRobin Appelman2016-08-301-0/+3
| | | |
* | | | Merge pull request #1190 from ↵Morris Jobke2016-08-302-2/+105
|\ \ \ \ | |/ / / |/| | | | | | | | | | | nextcloud/addressbook-correctly-handle-multi-values Correctly handle multi-values when converting VCards to array
| * | | Add a unit test for all the magicJoas Schilling2016-08-301-1/+64
| | | |
| * | | Correctly handle multi-values when converting VCards to arrayJoas Schilling2016-08-301-1/+41
| | | |
* | | | Merge pull request #1187 from nextcloud/danysz-masterJoas Schilling2016-08-302-0/+6
|\ \ \ \ | | | | | | | | | | Update the mime types with the relevant types for "apple-iWorks"
| * | | | update to proper icons and run occ command to update JS fileMorris Jobke2016-08-302-3/+6
| | | | |
| * | | | Update the mime types with the relevant types for "apple-iWorks" (pages, ↵Daniel Szasz2016-08-301-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-previewsRoeland Jago Douma2016-08-302-1/+3
|\ \ \ \ | | | | | | | | | | Check if the file isReadable() before sending a (cached) preview
| * | | | Check if the file isReadable() before sending a (cached) previewJoas Schilling2016-08-292-1/+3
| | |_|/ | |/| |
* | | | Merge pull request #1138 from nextcloud/expiry-as-occ-commandRoeland Jago Douma2016-08-304-0/+263
|\ \ \ \ | |_|/ / |/| | | Add occ command to expire the trashbin (#25878)
| * | | Add occ command to expire the trashbin (#25878)Thomas Müller2016-08-294-0/+263
| |/ / | | | | | | | | | | | | | | | * Add occ command to expire the trashbin * Fix versions folder in setup check
* | | Merge pull request #1178 from nextcloud/theming-spinner-animationJoas Schilling2016-08-302-8/+19
|\ \ \ | |_|/ |/| | Theming: Show loading spinner while uploading files
| * | 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
|\ \ \ | | | | | | | | Move OCSAuthAPI to AppFramework
| * | | Use function parametersRoeland Jago Douma2016-08-282-17/+8
| | | |
| * | | Move OCSAuthAPI to AppFrameworkRoeland Jago Douma2016-08-283-49/+76
| | | | | | | | | | | | | | | | | | | | | | | | * Convert class * Convert routes * Convert tests
* | | | Merge pull request #974 from nextcloud/move_ocs_routes_to_fedfilesharingMorris Jobke2016-08-305-165/+162
|\ \ \ \ | | | | | | | | | | Move federated sharing routes to the federatedfilesharing app
| * | | | Move federated sharing routes to the federatedfilesharingappRoeland Jago Douma2016-08-285-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-25823Roeland Jago Douma2016-08-301-1/+5
|\ \ \ \ | | | | | | | | | | Include "Product Name" in status.php printout
| * | | | 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
| |/ / / | | | | | | | | | | | | | | | | | | | | identifyer -> identifier removed variable
* | | | Merge pull request #1172 from nextcloud/core_cleanupMorris Jobke2016-08-309-79/+53
|\ \ \ \ | | | | | | | | | | Core controller cleanup
| * | | | AvatarController use proper JSONResponseRoeland Jago Douma2016-08-292-45/+36
| | | | | | | | | | | | | | | | | | | | | | | | | * Do not rely on DataResponse magic. We want JSON so use JSON * Fix tests