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

42670 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Maximilian Wende
7c453b2425
Update tests for indeterminate state, fix slashes not being escaped 
Signed-off-by: Maximilian Wende <dasisdormax@mailbox.org>
 2018-02-16 11:42:41 +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
Joas Schilling
a097ecded7
Add info also to public interface 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-02-16 09:44:35 +01:00
Nextcloud bot
620ee00ac5
[tx-robot] updated from transifex 2018-02-16 01:12:10 +00:00
Maximilian Wende
602f50b2d4
Fix indeterminate checkbox state not showing correctly 
Also, the checkbox is updated to the correct state while a
permission change is in progress.

should fix issue #8371

Signed-off-by: Maximilian Wende <dasisdormax@secure.mailbox.org>
 2018-02-15 22:41:09 +01:00
Maximilian Wende
d4238a52b2
Add indeterminate state to 'can edit' share permission checkbox, see #8371 
Signed-off-by: Maximilian Wende <dasisdormax@secure.mailbox.org>
 2018-02-15 21:10:39 +01:00
Roland Tapken
38ba64af77 Split move and copy operations 
The new 'Move and copy' operation from #6040 requires UPDATE permissions
on the selected files. However, READ would be sufficient to create a
copy of a file (if not viewed as a public share). For this reason this patch:

- changes the permission of the 'MoveCopy' action to PERMISSION_READ
- changes the label of the action depending on the permissions
- changes the available buttons in the Move/Copy dialog depending on the
  permissions.

The same changes are done to the filelist view for bulk actions.

Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
 2018-02-15 18:51:12 +01: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
Joas Schilling
339e320064
Fix existing usages 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-02-15 12:18:51 +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
Joas Schilling
350e38396f
Allow custom HTML in HTML Emails 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-02-15 12:09:19 +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
Morris Jobke
236086c457
Merge pull request #8335 from nextcloud/remove-unused-import 
Remove unused import statements
 2018-02-14 22:23:07 +01:00
Arthur Schiwon
aeb7503feb
fix systemtags event with numeric user ids 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-02-14 17:02:54 +01:00
Arthur Schiwon
011dab246d
tests for systemtags related to numeric user ids 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-02-14 17:02:35 +01:00
Morris Jobke
d3d045dd5c
Remove unused import statements 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-14 16:55:43 +01:00
Arthur Schiwon
023d028c57
fix creating comments when file is accessible to users with numeric ids 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-02-14 14:39:39 +01:00
Arthur Schiwon
a5a0a938f2
test creating comments with numeric user ids 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-02-14 14:39:10 +01:00
Joas Schilling
a966d5256c
Merge pull request #8328 from nextcloud/bugfix/noid/filter-out-the-current-user-by-email-too 
Filter out the current user when searching for emails too
 2018-02-14 11:53:48 +01:00
Joas Schilling
c32a94b78d
Merge pull request #8337 from nextcloud/use-non-alias-method 
Use non aliased method instead
 2018-02-14 10:09:09 +01:00
Joas Schilling
d1fb939e86
Merge pull request #8338 from nextcloud/simplify-return-statement 
Simplify return statement
 2018-02-14 10:08:28 +01:00
Nextcloud bot
ff1b343c4a
[tx-robot] updated from transifex 2018-02-14 01:11:53 +00:00
Morris Jobke
5819e5e5b3
Make lib/autoloader.php strictly typed and properly type hinted 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-13 22:07:58 +01:00
Morris Jobke
e2974f1133
Simplify return statement 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-13 21:55:24 +01:00
Morris Jobke
954da26e26
Use non aliased method instead 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-13 21:48:24 +01:00
Morris Jobke
d18d323f21
Remove fromMailAddress from MailSettingsController 
Was removed in https://github.com/nextcloud/server/pull/4379 (0a54d5a) and https://github.com/nextcloud/server/pull/4380 (bae64e8)

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-13 21:40:38 +01:00