summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1216 from nextcloud/theming_phpunit_fixesJulius Härtl2016-08-311-5/+5
|\
| * Fix ThemingDefaults getMock deprecationRoeland Jago Douma2016-08-311-5/+5
|/
* Merge pull request #1188 from nextcloud/2fa-redirect-default-appLukas Reschke2016-08-312-17/+15
|\
| * check same URL in unit testsChristoph Wurst2016-08-301-11/+12
| * redirect to default app after solving the 2FA challengeChristoph Wurst2016-08-302-8/+5
* | Merge pull request #1212 from nextcloud/fix_federatedfilesharingtestsRoeland Jago Douma2016-08-315-27/+35
|\ \
| * | Fix deprecated usages of getMock in federatedfilesharingRoeland Jago Douma2016-08-315-27/+35
* | | Merge pull request #797 from nextcloud/only-match-for-auth-cookieJoas Schilling2016-08-312-3/+92
|\ \ \
| * | | Match only for actual session cookieLukas Reschke2016-08-092-3/+92
* | | | Merge pull request #1201 from nextcloud/usermountcache-orphanedshareRoeland Jago Douma2016-08-312-2/+9
|\ \ \ \ | |_|/ / |/| | |
| * | | Added closeCursor in SharedMount numeric idVincent Petry2016-08-301-0/+1
| * | | Prevent error with orphaned shares when updating user mount cacheVincent Petry2016-08-302-2/+8
* | | | Merge pull request #608 from nextcloud/small-encryption-improvementJoas Schilling2016-08-312-3/+18
|\ \ \ \
| * | | | skip shared files, if files get decrypted only for a specific user we shouldn...Bjoern Schiessle2016-07-272-3/+18
* | | | | Merge pull request #1202 from nextcloud/remove_polyfills_for_55_56Roeland Jago Douma2016-08-311-0/+0
|\ \ \ \ \
| * | | | | 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
|\ \ \ \ \ \
| * | | | | | 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 nextcloud/oc-integration_tests_local_external_s...Lukas Reschke2016-08-314-6/+72
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | 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 s...Sergio Bertolin2016-08-305-26/+15
| * | | | | | Added feature and context, not working yet, option to allow sharing needs to ...Sergio Bertolin2016-08-302-0/+50
| * | | | | | 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 searchVincent Petry2016-08-302-1/+53
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #1198 from nextcloud/php56-and-70-onlyLukas Reschke2016-08-303-37/+9
|\ \ \ \ \ \
| * | | | | | 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 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 requestRobin Appelman2016-08-301-0/+3
* | | | | | Merge pull request #1190 from nextcloud/addressbook-correctly-handle-multi-va...Morris Jobke2016-08-302-2/+105
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | 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 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, numb...Daniel Szasz2016-08-301-0/+3
| | |_|/ / / | |/| | | |
* | | | | | 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) previewJoas Schilling2016-08-292-1/+3
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #1138 from nextcloud/expiry-as-occ-commandRoeland Jago Douma2016-08-304-0/+263
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |