wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
34356 commits 157 branches 562 tags 714 MiB
Commit graph

34356 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Joas Schilling
490c219893 Merge pull request #1134 from nextcloud/fix_redirection 
Fix redirection taking care of protocol and port
 2016-08-29 15:49:25 +02:00
Joas Schilling
05228a19c4 Merge pull request #1133 from nextcloud/fix-numerous 
always return numeric storage id as int, also check type equality in …
 2016-08-29 15:48:36 +02:00
Joas Schilling
1bcb5cc6dc Merge pull request #1131 from nextcloud/add-padding 
Adds padding and max-width to the input for the sign up page. (#25959)
 2016-08-29 15:46:59 +02:00
Roeland Jago Douma
fd0fc3c7a4 Merge pull request #1128 from nextcloud/upstream-25922 
Users page lazy multiselect group dropdowns
 2016-08-29 15:37:59 +02:00
Lukas Reschke
4005e58f93 Merge pull request #1117 from iamfool/master 
Update Admin.php
 2016-08-29 15:27:41 +02:00
Jörn Friedrich Dreyer
d5d5b202d8
use correct OCP\Defaults 2016-08-29 15:22:02 +02:00
martin.mattel@diemattels.at
3e4038289f
Include "Product Name" in status.php printout 
identifyer -> identifier

removed variable
 2016-08-29 15:21:56 +02:00
Thomas Müller
a4cf4a53f3
Before a user is getting scanned the database connection is re-established 2016-08-29 14:49:55 +02:00
Vincent Petry
7fa66409ae
Display number of hidden files in files summary (#25870) 
When dot files are hidden, the table summary and selection summary will
not show how many hidden files were included.
 2016-08-29 14:47:41 +02:00
Vincent Petry
29b45c5c42
Make sure file list files config always exists 
Initialize files config with defaults in case none was passed
 2016-08-29 14:44:25 +02:00
Markus Goetz
0cb34c2fa5
[master] DAV: Return data-fingerprint always when asked (#25482) 
For owncloud/client#5056
Users can configure arbitrary subfolders for syncing, therefore we should
always return it when asked for.
The sync client makes sure to not always ask for it to save bandwidth.
 2016-08-29 14:37:14 +02:00
Jörn Friedrich Dreyer
4d31caa6f8
fix a few minor code smells 2016-08-29 14:34:37 +02:00
Thomas Müller
82e8762c84
Fix issues where some user settings cannot be loaded when the user id differs in case sensitivity - fixes #25684 (#25686) 2016-08-29 14:33:16 +02:00
Thomas Müller
df1cc94c23
Some cleanup within OC_Image (#25875) 2016-08-29 14:31:59 +02:00
Thomas Müller
297d2e48ad
Add occ command to expire the trashbin (#25878) 
* Add occ command to expire the trashbin

* Fix versions folder in setup check
 2016-08-29 14:30:40 +02:00