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

43787 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roger Szabo
571b337a5e adjust css to nc13 core changes 
Signed-off-by: Roger Szabo <roger.szabo@web.de>
 2018-04-24 15:53:48 +08:00
Roeland Jago Douma
1ceb081c9b
Merge pull request #9280 from nextcloud/bugfix/noid/swift-v3-scope 
Swift v3 requires setting a scope
 2018-04-24 09:49:27 +02:00
Roger Szabo
15fb3bb73a remove reset password link 
Signed-off-by: Roger Szabo <roger.szabo@web.de>
 2018-04-24 15:47:31 +08:00
Roeland Jago Douma
4d5a2cce8d
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-24 08:07:25 +02:00
Nextcloud bot
9339c7d20f
[tx-robot] updated from transifex 2018-04-24 00:11:53 +00:00
Roeland Jago Douma
3b3ff39431
Make ShareesAPIController strict 
Fixes #9279

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-23 22:05:21 +02:00
Roeland Jago Douma
3b34a77c58
Make the ShareAPIController strict 
Fixes #9279

With types we can force php to not cast a full nummeric user to an int.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-23 20:31:57 +02:00
Roeland Jago Douma
ba71918ad2
Swift v3 requires setting a scope 
Unscoped auth is not guaranteed to return a catalog. So require the
scope to be set properly.

See https://developer.openstack.org/api-ref/identity/v3/index.html#password-authentication-with-unscoped-authorization

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-23 19:34:09 +02:00
Morris Jobke
83b0ce0955
Merge pull request #9278 from nextcloud/bug/noid/ldap-wizard-newaccess 
Access needs UserManager, missed to add in #8833
 2018-04-23 17:49:07 +02:00
Daniel Calviño Sánchez
9b150001ff
Merge pull request #9272 from nextcloud/bugfix/noid/save-a-query-help-saving-the-world 
Only query last comment info, when there is one
 2018-04-23 16:43:09 +02:00
Morris Jobke
351255b216
Merge pull request #9276 from nextcloud/remove-unused-config-sample 
Remove unused config option
 2018-04-23 16:29:06 +02:00
Arthur Schiwon
ed5f53bd49
Access needs UserManager, missed to add in #8833 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-23 15:58:50 +02:00
Joas Schilling
05a6b71a61
Merge pull request #9271 from nextcloud/fix-undefined-variable 
Fix undefined variable - found by Phan
 2018-04-23 15:51:15 +02:00
Roeland Jago Douma
000f41ba01
Merge pull request #9275 from nextcloud/group_backends 
Make the group backends also possible using interfaces
 2018-04-23 15:37:34 +02:00
Morris Jobke
f2e18d496e
Remove unused config option 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-23 15:06:38 +02:00
Morris Jobke
6c6feeaa1e
Merge pull request #9269 from nextcloud/fix-DI-for-federeatedfilesharing-controller 
Fix DI for federated file sharing controller
 2018-04-23 15:06:11 +02:00
Roeland Jago Douma
961b27eeb0
Convert group Database backend 
This now uses the new interfaces

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-23 14:39:30 +02:00
Morris Jobke
093cd01ac2
Fix DI for federated file sharing controller 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-23 13:49:28 +02:00
Roeland Jago Douma
5fcd97dcb6
Bump autoloader 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-23 13:27:14 +02:00
Morris Jobke
4fd697e733
Remove a check for an unused variable 
Left over from a refactoring

https://github.com/nextcloud/server/pull/1940

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-23 11:53:48 +02:00
Joas Schilling
446efa4625
Only query last comment info, when there is one 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-04-23 11:50:30 +02:00
Roeland Jago Douma
cf0501d632
Make the group backends also possible using interfaces 
Just like for the user backends the group backends should also be
properly done using interfaces.

This adds the interfaces and abstract class to get started

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-23 11:49:28 +02:00
Morris Jobke
431ccb6386
Fix undefined variable - found by phan 
Added in https://github.com/nextcloud/server/pull/8314/files#diff-a55c10804586cd797b7f3f16556c1457R157

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-23 11:34:41 +02:00
Morris Jobke
67dcff7a1f
Fix undefined variable - found by Phan 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-23 11:30:22 +02:00
Roeland Jago Douma
3ff041f86d
Merge pull request #9245 from nextcloud/fix-race-condition-when-preparing-upload-folder 
Fix race condition when preparing upload folder
 2018-04-23 08:50:16 +02:00
Roeland Jago Douma
a80fcf177b
Merge pull request #9255 from nextcloud/less-deprecated-calls 
Less deprecated calls to OCP\Util::writeLog
 2018-04-23 08:04:50 +02:00
Nextcloud bot
a74fbe78a7
[tx-robot] updated from transifex 2018-04-23 00:11:49 +00:00
Julius Härtl
cbdaa8b7ce
Add min-width to trick the table width calculation in safari 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-22 23:09:15 +02:00
Roeland Jago Douma
0ed6f9c2da
Merge pull request #9129 from nextcloud/feature/noid/proper-comments-offset 
Add proper comment offset support
 2018-04-22 20:47:30 +02:00
Roeland Jago Douma
9f4e928c0f
Merge pull request #9225 from nextcloud/bugfix/9157/ipv6-database-host 
Allow IPv6 database hosts
 2018-04-22 20:43:29 +02:00
Morris Jobke
dd34cb7540
Less deprecated calls to OCP\Util::writeLog 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-22 20:41:49 +02:00
Daniel Calviño Sánchez
375a55b0ad
Fix race condition when preparing upload folder 
Before any upload is submitted the upload is registered in a list of
known uploads; this is needed to retrieve the upload object at several
points of the upload process. When a chunked upload is submitted first a
directory to upload all the chunks is created and, once that is done,
the chunks are sent; in order to send a chunk the upload object needs to
be retrieved from the list of known uploads.

When all the active uploads were finished the list of known uploads was
cleared. However, an upload is not active until it actually starts
sending the data, so while waiting for the upload directory to be
created the upload is already in the list of known uploads yet not
active. Due to all this, if the active uploads finished while another
pending upload was waiting for the upload directory to be created that
pending upload would be removed from the list of known uploads too, and
once the directory was created and thus the chunks were sent a field of
a null upload object would be accessed thus causing a failure.

Instead of removing all the known uploads at once when the active
uploads finish now each upload is explicitly removed when it finishes.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-04-22 20:38:11 +02:00
Nextcloud bot
74b5ab8d39
[tx-robot] updated from transifex 2018-04-22 00:11:51 +00:00
Nextcloud bot
6b5132502e
[tx-robot] updated from transifex 2018-04-21 00:11:39 +00:00
Morris Jobke
0580f498f2
Merge pull request #9254 from nextcloud/fix-app-sidebar-offset 
Also adjust app sidebar offset to new header height
 2018-04-20 17:13:52 +02:00
Julius Härtl
dbfd00897f
Also adjust app sidebar offset to new header height 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-20 14:22:06 +02:00
Nextcloud bot
8748e636f6
[tx-robot] updated from transifex 2018-04-20 00:12:00 +00:00
Julius Härtl
d771f65911
Add more tests for ImageManager 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-19 20:14:40 +02:00
Julius Härtl
b385f1c7d5
Fix theming tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-19 20:14:40 +02:00
Julius Härtl
7f9dabd984
Make sure the custom favicon is used 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-19 20:14:40 +02:00
Julius Härtl
39f44e1452
Add typehints 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-19 20:14:40 +02:00
Julius Härtl
daadc1c892
Fix background color 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-19 20:14:39 +02:00
Julius Härtl
5a5c125b23
Return value 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-19 20:14:39 +02:00
Julius Härtl
3ad2768909
Remove unneeded preview image handling 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-19 20:14:39 +02:00
Julius Härtl
d8045966de
Fix undo preview and remove duplicate code 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-19 20:14:39 +02:00
Julius Härtl
d8b57924fb
Add advanced theming options to frontend 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-19 20:14:39 +02:00
Julius Härtl
ee44dec0ac
Use generic image upload in theming JS 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-19 20:14:38 +02:00
Julius Härtl
dfda5c683d
Use SCSS for previewing images as well 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-19 20:14:38 +02:00
Julius Härtl
02d3e09c86
Move theming settings to SCSS 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-19 20:14:38 +02:00
Julius Härtl
272b392cac
Move to more generic image handling and add extra images 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-19 20:14:38 +02:00