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

42475 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin Appelman
817f2f8f49
adjust swift external storage to new openstack sdk 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-02-19 19:41:16 +01:00
Robin Appelman
3192efc415
adjust swift object storage to new openstack sdk 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-02-19 19:41:16 +01:00
Robin Appelman
2abfe3347e
switch from rackspace/php-opencloud to php-opencloud/openstack 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-02-19 19:41:16 +01:00
Roeland Jago Douma
7ad1e13961
Merge pull request #8158 from nextcloud/s3-minio 
Use a more widely available method to test s3 settings
 2018-02-19 17:09:36 +01:00
Roeland Jago Douma
4e6d98ea8c
Merge pull request #8424 from nextcloud/fix/update-app 
Fix updating an app
 2018-02-19 15:54:49 +01:00
Roeland Jago Douma
543e1626de
Merge pull request #8426 from nextcloud/refactor/notification-showTempoary-unused-var 
Remove unused var in OC.Notification.showTemporary
 2018-02-19 12:42:59 +01:00
Christoph Wurst
3992484323
Remove unused var in OC.Notification.showTemporary 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-02-19 11:00:58 +01:00
Roeland Jago Douma
bffdcd76f0
Merge pull request #8334 from nextcloud/lib-strict-typing 
Make lib/autoloader.php strictly typed and p…
 2018-02-19 10:50:38 +01:00
Roeland Jago Douma
9c33ebad5d
Merge pull request #8366 from nextcloud/remove-disable-caching-headers 
Use normal header() calls instead of private method calls
 2018-02-19 10:40:45 +01:00
Christoph Wurst
1a8916af59
Fix updating an up 
OC_App has been made strict recently and the updater code was not
compatible to this. This adds the array to string conversion of the
Nextcloud version and fixes a typo in OC_App (sstring -> string)

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-02-19 10:28:41 +01:00
Morris Jobke
70b1f510f2
Use normal header() calls instead of private method calls 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-19 09:40:25 +01:00
Nextcloud bot
b3ca73dc27
[tx-robot] updated from transifex 2018-02-19 01:11:54 +00:00
Nextcloud bot
667d21ac7d
[tx-robot] updated from transifex 2018-02-18 01:12:03 +00:00
Morris Jobke
ac63c207a9
Merge pull request #8411 from nextcloud/add-strict-types-to-oc_app 
Add strict types to OC_App
 2018-02-17 21:34:20 +01:00
Morris Jobke
9b68f80c4b
Add remaining type hints, that were already okay 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-17 16:05:23 +01:00
Morris Jobke
9fcf185c7d
Always return a string in OC_App::getCurrentApp and no boolean 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-17 16:05:23 +01:00
Morris Jobke
e4077672e1
Use empty array as group list in OC_App::enable 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-17 16:05:23 +01:00
Morris Jobke
2e15c0d871
Refactor dependencies in setAppTypes 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-17 16:05:23 +01:00
Morris Jobke
9dc3b04802
Fix app version to be always string and neither array nor null 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-17 16:05:13 +01:00
Morris Jobke
edee243b27
OC_App::loadApps now only accepts an array as type list 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-17 15:27:43 +01:00
Morris Jobke
2a2833e30f
Migrate to short array syntax 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-17 15:18:34 +01:00
Nextcloud bot
d953db8683
[tx-robot] updated from transifex 2018-02-17 01:12:04 +00:00
Morris Jobke
57e0881a9e
Merge pull request #8232 from nextcloud/bugfix/8007/validate-appinfo-against-appstore-schema 
Validate appinfo against appstore schema
 2018-02-16 22:56:10 +01:00
Morris Jobke
45e7bb7f40
Merge pull request #8391 from coder-hugo/feature/mysql_ansi_quotes 
Don't use double quotes in MySQL queries
 2018-02-16 22:55:23 +01:00
Joas Schilling
211212f4b3
App manager is not needed anymore 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-02-16 17:13:36 +01:00
Robin Müller
6aa816915a
Don't use double quotes in MySQL queries 
MySQL databases with the ANSI_QUOTES mode enabled treat " as an identifier
quote (see https://dev.mysql.com/doc/refman/5.7/en/sql-mode.html#sqlmode_ansi_quotes).
So for such databases the 'occ upgrade' fails with an error message like this:
... unknown column 'oc_*' in where clause.

This fix replaces the doulbe quotes with single quotes that should be always
used in MySQL queries to quote literal strings.

Signed-off-by: Robin Müller <robin.mueller@1und1.de>
 2018-02-16 15:03:12 +01:00
Morris Jobke
8b3e703c53
Merge pull request #8396 from nextcloud/fix-typo-in-build-matrix-of-drone-yml 
Fix typo in build matrix of ".drone.yml"
 2018-02-16 13:33:32 +01:00
Daniel Calviño Sánchez
32c6cfe7df Fix typo in build matrix of .drone.yml 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-02-16 12:38:46 +01:00
Morris Jobke
66654bbd18
Merge pull request #8382 from nextcloud/make-acceptance-tests-for-comments-more-consistent-with-the-others 
Make acceptance tests for comments more consistent with the others
 2018-02-16 10:27:25 +01:00
Joas Schilling
f095001e4b
Fix info.xml files of shipped apps 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-02-16 10:24:03 +01:00
Joas Schilling
17a26dfcc1
Validate the info.xml against the appstore schema file 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-02-16 10:23:51 +01:00
Nextcloud bot
620ee00ac5
[tx-robot] updated from transifex 2018-02-16 01:12:10 +00:00
Daniel Calviño Sánchez
81fdbc6554 Take into account the comment message when looking for it 
Instead of checking that the list contains one comment it is now checked
that a comment with certain message is visible. This makes the step (and
the locator) more reusable in future tests and also simplifies the code.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-02-15 17:48:07 +01:00
Daniel Calviño Sánchez
0a2c98ac89 Adjust timeouts in the step to create a new comment 
Depending on the previous steps the new comment field may be already
shown or not when the step to create a new comment is executed.
Therefore, the timeout was increased from 2 to the "standard" 10 seconds
used in other tests.

If the new comment field was found there is no need to use a timeout
when looking for the new comment button; it is either there or not, it
will not appear after some time.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-02-15 17:48:07 +01:00
Daniel Calviño Sánchez
28d5862643 Move locators above step definitions 
The locators are moved above the step definitions for consistency with
other context files; besides that I made some minor adjustments for
consistency too in the locator descriptions and identation, and moved
the locators for ".newCommentRow" descendants together.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-02-15 17:48:07 +01:00
Daniel Calviño Sánchez
c4478f6297 Add acceptance tests for comments to Drone 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-02-15 17:48:07 +01:00
Morris Jobke
14bc9b1714
Merge pull request #8095 from nextcloud/webapps-capabilities 
Expose navigation entries as API endpoint
 2018-02-15 16:55:12 +01:00
Morris Jobke
8a505e8767
Merge pull request #8376 from nextcloud/devgals 
Fix edit tag textbox size
 2018-02-15 15:50:50 +01:00
Morris Jobke
e97ae9aac5
Merge pull request #8372 from nextcloud/encapsulate-app-require 
Properly encapsulate require_once for app.php
 2018-02-15 15:47:22 +01:00
Aastha Gupta
fd39d35138 Fix edit tag textbox size 
Fixes #7586

Signed-off-by: Aastha Gupta <aastha.gupta4104@gmail.com>
 2018-02-15 17:34:42 +05:30
Morris Jobke
b7ee624988
Merge pull request #8280 from coliff/coliff-email-inputtype 
Correct input type for email
 2018-02-15 12:49:27 +01:00
Julius Härtl
f36e8313ff
Add throws annotation 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-15 12:23:49 +01:00
Julius Härtl
c300a64520
Merge pull request #8277 from nextcloud/avatars-shared-all 
Show share owner avatars on all file lists
 2018-02-15 12:11:09 +01:00
Morris Jobke
07e91d2d62
Merge pull request #7754 from pierlon/master 
Add icons to devices/sessions
 2018-02-15 11:27:54 +01:00
Julius Härtl
04053311ee
Properly encapsulate require_once for app.php 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-15 11:20:22 +01:00
Julius Härtl
e694b30a4f
Update phpDoc comments and add more type hinting 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-15 10:38:25 +01:00
Morris Jobke
cd2e5b549c
Merge pull request #8365 from nextcloud/fix-phpdoc 
Fix typo in PHPDoc
 2018-02-15 10:35:24 +01:00
Morris Jobke
9cb2aaa596
Fix typo in PHPDoc 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-15 10:21:31 +01:00
Nextcloud bot
01623d4aca
[tx-robot] updated from transifex 2018-02-14 21:37:31 +00:00
Morris Jobke
24f96513fd
Merge pull request #8259 from nextcloud/guzzle6 
update guzzlehttp/guzzle to 6.3.0
 2018-02-14 22:26:19 +01:00