Commit graph

34371 commits

Author SHA1 Message Date
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
Roeland Jago Douma
6a85882f61
Fix tests 2016-08-30 09:00:22 +02:00
Roeland Jago Douma
14136295b7
Cache avatars properly
* Set proper caching headers for avatars (15 minutes)
* For our own avatar use some extra logic to invalidate when we update
2016-08-30 09:00:16 +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
Julius Haertl
0e8b138534
Theming: Show loading spinner while uploading files 2016-08-30 06:40:41 +02:00
blizzz
7278bd2987 Merge pull request #1132 from nextcloud/prevent-parse-error-on-editing-an-html-comment
Prevent parse error on editing an HTML comment
2016-08-30 00:14:08 +02:00
Lukas Reschke
1702abc204 Merge pull request #1169 from nextcloud/2fa-single-provider
redirect to 2fa provider if there's only one active for the user
2016-08-29 21:54:18 +02:00
Roeland Jago Douma
b1a090f357
AvatarController use proper JSONResponse
* Do not rely on DataResponse magic. We want JSON so use JSON
* Fix tests
2016-08-29 21:52:14 +02:00
Roeland Jago Douma
f6423f74e3
Minor cleanup in core Controllers 2016-08-29 21:52:09 +02:00
Lukas Reschke
9ebc58c3d8 Merge pull request #1170 from nextcloud/theming-fix-primary-button
Theming: fix primary button for bright colors
2016-08-29 21:39:09 +02:00
Roeland Jago Douma
c0ed865ab2
UserController does not require Defaults 2016-08-29 21:14:50 +02:00
Roeland Jago Douma
4f93dce2e1 Merge pull request #1130 from nextcloud/shared-upload-quota
[uc] Fix uploading to shared folder with quota
2016-08-29 20:37:07 +02:00
Roeland Jago Douma
e1ea45f32b Merge pull request #1147 from nextcloud/files-hidden-files-summary
Display number of hidden files in files summary (#25870)
2016-08-29 20:36:07 +02:00
Roeland Jago Douma
606fd77432 Merge pull request #1146 from nextcloud/init-filesconfig
Make sure file list files config always exists
2016-08-29 20:35:56 +02:00
Roeland Jago Douma
1f8c3c153c Merge pull request #1148 from nextcloud/files-scan-reconnect-database-before-each-user-master
Before a user is getting scanned the database connection is re-establ…
2016-08-29 20:25:59 +02:00
Roeland Jago Douma
013f691fe9
Fix phpdoc 2016-08-29 20:20:17 +02:00
Roeland Jago Douma
613704c58e Merge pull request #1145 from nextcloud/upstream-25794
DAV: Return data-fingerprint always when asked
2016-08-29 19:56:50 +02:00
Roeland Jago Douma
7c7f862712 Merge pull request #1142 from nextcloud/fix-case-sensitive-settings
Fix issues where some user settings cannot be loaded when the user id…
2016-08-29 19:56:35 +02:00
Roeland Jago Douma
39749c0cd4 Merge pull request #1139 from nextcloud/clean-code-image
Some cleanup within OC_Image (#25875)
2016-08-29 19:56:16 +02:00
Christoph Wurst
907e832de4 Merge pull request #1115 from nextcloud/fix_146
Link 'Allow editing' => 'Allow upload and editing'
2016-08-29 19:48:51 +02:00
Julius Haertl
d43c9b9e79
Theming: fix primary button for bright colors 2016-08-29 19:07:27 +02:00
Christoph Wurst
291dd0bd31 redirect to 2fa provider if there's only one active for the user 2016-08-29 18:36:39 +02:00
Joas Schilling
402feb9e13 Merge pull request #1136 from nextcloud/fix-16041
Modified overflow in multiselector
2016-08-29 15:57:33 +02:00
Joas Schilling
8dd5bbe7fe Merge pull request #1135 from nextcloud/choose-buttons
Choose button remains disabled unless files are chosen
2016-08-29 15:51:54 +02:00