| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #1188 from nextcloud/2fa-redirect-default-app | Lukas Reschke | 2016-08-31 | 2 | -17/+15 |
|\ |
|
| * | check same URL in unit tests | Christoph Wurst | 2016-08-30 | 1 | -11/+12 |
| * | redirect to default app after solving the 2FA challenge | Christoph Wurst | 2016-08-30 | 2 | -8/+5 |
* | | Merge pull request #1212 from nextcloud/fix_federatedfilesharingtests | Roeland Jago Douma | 2016-08-31 | 5 | -27/+35 |
|\ \ |
|
| * | | Fix deprecated usages of getMock in federatedfilesharing | Roeland Jago Douma | 2016-08-31 | 5 | -27/+35 |
* | | | Merge pull request #797 from nextcloud/only-match-for-auth-cookie | Joas Schilling | 2016-08-31 | 2 | -3/+92 |
|\ \ \ |
|
| * | | | Match only for actual session cookie | Lukas Reschke | 2016-08-09 | 2 | -3/+92 |
* | | | | Merge pull request #1201 from nextcloud/usermountcache-orphanedshare | Roeland Jago Douma | 2016-08-31 | 2 | -2/+9 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | Added closeCursor in SharedMount numeric id | Vincent Petry | 2016-08-30 | 1 | -0/+1 |
| * | | | Prevent error with orphaned shares when updating user mount cache | Vincent Petry | 2016-08-30 | 2 | -2/+8 |
* | | | | Merge pull request #608 from nextcloud/small-encryption-improvement | Joas Schilling | 2016-08-31 | 2 | -3/+18 |
|\ \ \ \ |
|
| * | | | | skip shared files, if files get decrypted only for a specific user we shouldn... | Bjoern Schiessle | 2016-07-27 | 2 | -3/+18 |
* | | | | | Merge pull request #1202 from nextcloud/remove_polyfills_for_55_56 | Roeland Jago Douma | 2016-08-31 | 1 | -0/+0 |
|\ \ \ \ \ |
|
| * | | | | | 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 |
|\ \ \ \ \ \ |
|
| * | | | | | | 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 nextcloud/oc-integration_tests_local_external_s... | Lukas Reschke | 2016-08-31 | 4 | -6/+72 |
|\ \ \ \ \ \ \
| |_|/ / / / /
|/| | | | | | |
|
| * | | | | | | 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 s... | Sergio Bertolin | 2016-08-30 | 5 | -26/+15 |
| * | | | | | | Added feature and context, not working yet, option to allow sharing needs to ... | Sergio Bertolin | 2016-08-30 | 2 | -0/+50 |
| * | | | | | | 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 | 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 |
|\ \ \ \ \ \ |
|
| * | | | | | | 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 | 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 | Robin Appelman | 2016-08-30 | 1 | -0/+3 |
* | | | | | | Merge pull request #1190 from nextcloud/addressbook-correctly-handle-multi-va... | Morris Jobke | 2016-08-30 | 2 | -2/+105 |
|\ \ \ \ \ \
| |/ / / / /
|/| | | | | |
|
| * | | | | | 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 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, numb... | Daniel Szasz | 2016-08-30 | 1 | -0/+3 |
| | |_|/ / /
| |/| | | | |
|
* | | | | | | 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 | 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) | Thomas Müller | 2016-08-29 | 4 | -0/+263 |
| |/ / / / |
|
* | | | | | Merge pull request #1178 from nextcloud/theming-spinner-animation | Joas Schilling | 2016-08-30 | 2 | -8/+19 |
|\ \ \ \ \
| |_|/ / /
|/| | | | |
|