mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
34,239 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

34239 Commits

Author SHA1 Message Date
Julius Härtl 73ff24895e Merge pull request #1216 from nextcloud/theming_phpunit_fixes 
Fix ThemingDefaults getMock deprecation
 2016-08-31 21:46:22 +02:00
Roeland Jago Douma 011364317a
Fix ThemingDefaults getMock deprecation 2016-08-31 20:33:18 +02:00
Lukas Reschke 2685129184 Merge pull request #1188 from nextcloud/2fa-redirect-default-app 
redirect to default app after solving the 2FA challenge
 2016-08-31 19:46:38 +02:00
Roeland Jago Douma 5fe25fa648 Merge pull request #1212 from nextcloud/fix_federatedfilesharingtests 
Fix deprecated usages of getMock in federatedfilesharing
 2016-08-31 16:37:40 +02:00
Joas Schilling f9cea0b582 Merge pull request #797 from nextcloud/only-match-for-auth-cookie 
Match only for actual session cookie
 2016-08-31 15:59:16 +02:00
Roeland Jago Douma a0af513a4a Merge pull request #1201 from nextcloud/usermountcache-orphanedshare 
[master] Usermountcache orphanedshare
 2016-08-31 15:07:13 +02:00
Roeland Jago Douma ac2be923a6
Fix deprecated usages of getMock in federatedfilesharing 2016-08-31 14:06:51 +02:00
Joas Schilling e4311a2ebd Merge pull request #608 from nextcloud/small-encryption-improvement 
skip shared files, if files get decrypted only for a specific user we…
 2016-08-31 12:30:37 +02:00
Roeland Jago Douma a82d4a56fb Merge pull request #1202 from nextcloud/remove_polyfills_for_55_56 
Remove 3rdparty for polyfills for php5.4 and php5.5
 2016-08-31 12:15:22 +02:00
Lukas Reschke b3ad3a3086 Merge pull request #1137 from nextcloud/external_storage_lnk 
External storage lnk
 2016-08-31 12:00:48 +02:00
Lukas Reschke fc242e3848 Merge pull request #1196 from nextcloud/oc-integration_tests_local_external_storage 
Integration test on a local storage
 2016-08-31 11:43:17 +02:00
Lukas Reschke ad07c83d84
Update third-party reference 2016-08-31 11:31:05 +02:00
Lukas Reschke 84c742b95e
Use "testing" instead of "user_ldap" as test app 2016-08-31 10:40:17 +02:00
Roeland Jago Douma 9284ab5a5b
Remove 3rdparty for polyfills for php5.4 and php5.5 2016-08-31 08:50:26 +02:00
Lukas Reschke aa90e69b66 Merge pull request #1189 from nextcloud/share-allowspaceinremote 
Allow space for federated share id search
 2016-08-30 19:54:35 +02:00
Vincent Petry 423378ea17
Added closeCursor in SharedMount numeric id 2016-08-30 19:49:31 +02:00
Vincent Petry 669b0bc2ae
Prevent error with orphaned shares when updating user mount cache 2016-08-30 19:49:23 +02:00
Lukas Reschke d17e126330 Merge pull request #1198 from nextcloud/php56-and-70-only 
Exclude older PHP versions from .travis.yml
 2016-08-30 19:11:16 +02:00
Lukas Reschke 57f9117843 Merge pull request #1087 from nextcloud/get-delay-twice 
dont get bruteforce delay twice
 2016-08-30 18:43:01 +02:00
Lukas Reschke 5e10284e34
Proper branding 2016-08-30 18:27:44 +02:00
Lukas Reschke 4212ffbdac
Show error if PHP version below 5.6 is used 2016-08-30 18:26:48 +02:00
Lukas Reschke d149f2288d
Execute only tests for modern PHP versions 2016-08-30 18:26:27 +02:00
Lukas Reschke 1bc7e338a4
Exclude older PHP versions from .travis.yml 2016-08-30 17:50:28 +02:00
Lukas Reschke 2a6193e7aa Merge pull request #1195 from nextcloud/heartbeat-short-circuit 
Short circuit processing of the heartbeat request
 2016-08-30 17:41:45 +02:00
Sergio Bertolín 81c18f5aa7
Creating the folder when the tests run 2016-08-30 17:23:56 +02:00
Sergio Bertolín 86cfcde5e9
Changed enabled/disabled app in provisioning api tests 2016-08-30 17:23:49 +02:00
Sergio Bertolín 7106129baa
External storage was not enabled and content was not deleted before scenarios 2016-08-30 17:23:26 +02:00
Sergio Bertolín 3a5d29fb59
Added local_storage folder 2016-08-30 17:23:22 +02:00
Sergio Bertolin b7b0f4780c
Run as current user 2016-08-30 17:23:18 +02:00
Sergio Bertolin b154c8fa39
Removed extra context added needed option and remove storage after external storage scenarios 2016-08-30 17:23:13 +02:00
Sergio Bertolin 85f00e2c01
Added feature and context, not working yet, option to allow sharing needs to be added 2016-08-30 17:23:08 +02:00
Sergio Bertolin f72fea8d0e
Modified run.sh to mount a local storage 2016-08-30 17:23:04 +02:00
Robin Appelman acffaa55a1 Short circuit processing of the heartbeat request 2016-08-30 15:44:00 +02:00
Morris Jobke c54d6d05c9 Merge pull request #1190 from nextcloud/addressbook-correctly-handle-multi-values 
Correctly handle multi-values when converting VCards to array
 2016-08-30 14:46:36 +02:00
Christoph Wurst 8e5c4c91fa check same URL in unit tests 2016-08-30 13:28:04 +02:00
Joas Schilling ef34b49e43 Merge pull request #1187 from nextcloud/danysz-master 
Update the mime types with the relevant types for "apple-iWorks"
 2016-08-30 12:57:43 +02:00
Joas Schilling a123fe6f18
Add a unit test for all the magic 2016-08-30 12:24:20 +02:00
Joas Schilling 0c4d471c18
Correctly handle multi-values when converting VCards to array 2016-08-30 12:08:39 +02:00
Roeland Jago Douma 83490e90ef Merge pull request #1089 from nextcloud/allow-to-prevent-previews 
Check if the file isReadable() before sending a (cached) preview
 2016-08-30 11:33:48 +02:00
Roeland Jago Douma 989473169e Merge pull request #1138 from nextcloud/expiry-as-occ-command 
Add occ command to expire the trashbin (#25878)
 2016-08-30 11:32:26 +02:00
Vincent Petry ec9fd67bc5
Allow space for federated share id search 2016-08-30 11:11:59 +02:00
Christoph Wurst 0a0c7a9b92 redirect to default app after solving the 2FA challenge 2016-08-30 11:10:45 +02:00
Morris Jobke da1c51882b
update to proper icons and run occ command to update JS file 2016-08-30 10:33:43 +02:00
Daniel Szasz 5b9eabf4bc
Update the mime types with the relevant types for "apple-iWorks" (pages, numbers, keynote). Now the files are treated like a file when are in "Single file" mode. 2016-08-30 10:32:46 +02:00
Joas Schilling f4dfd1f1a3 Merge pull request #1178 from nextcloud/theming-spinner-animation 
Theming: Show loading spinner while uploading files
 2016-08-30 10:01:36 +02:00
Morris Jobke dd2482e2c2 Merge pull request #988 from nextcloud/ocs_federation 
Move OCSAuthAPI to AppFramework
 2016-08-30 08:49:05 +02:00
Morris Jobke c481210e2b Merge pull request #974 from nextcloud/move_ocs_routes_to_fedfilesharing 
Move federated sharing routes to the federatedfilesharing app
 2016-08-30 08:45:44 +02:00
Roeland Jago Douma 7da393c889 Merge pull request #1160 from nextcloud/downstream-25823 
Include "Product Name" in status.php printout
 2016-08-30 08:36:37 +02:00
Morris Jobke e341bde8b9 Merge pull request #1172 from nextcloud/core_cleanup 
Core controller cleanup
 2016-08-30 08:32:55 +02:00
Morris Jobke 4afe4bda26 Merge pull request #891 from nextcloud/us_25810 
[OC] Fix unmerged shares repair targetdecision
 2016-08-30 08:22:34 +02:00