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

43182 commits

This branch
This branch
All branches
Author SHA1 Message Date
Daniel Calviño Sánchez
89b0e34d9b Extract code to filter suggestions to its own function 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-03-20 19:09:04 +01:00
Daniel Calviño Sánchez
1c440519c2 Show an error when getting the suggestions succeeds with failure content 
Instead of silently failing now an error is shown to the user when the
ajax call to get the suggestions succeeds yet it returns failure content
(for example, if an "OCSBadRequestException" was thrown in the server).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-03-20 19:09:04 +01:00
Daniel Calviño Sánchez
ed1452d7a0 Use "showTemporary" instead of explicitly hiding the notification 
"OC.Notification.hide" expects the notification to be hidden to be
passed as an argument. As it was being used to show a temporary
notification the combination of "OC.Notification.show" and
"OC.Notification.hide" was replaced by a single call to
"OC.Notification.showTemporary".

The timeout could have been specified in the options of the call, but it
was left to the default value (7 seconds) for consistency with other
notifications.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-03-20 19:09:04 +01:00
Daniel Calviño Sánchez
fcef15af80 Move stub setup outside the test method 
Stubs should be restored outside the test method in which they are used
to ensure that they are properly restored no matter the result of the
test (for example, if an exception is thrown).

Besides that, this will make possible to reuse the stub in other sibling
tests without having to explicitly setup it in them.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-03-20 19:09:04 +01:00
Daniel Calviño Sánchez
d606219576 Extract code to get suggestions to its own method 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-03-20 19:09:04 +01:00
Daniel Calviño Sánchez
3980364b6d Add autocompletion tests for each type of share 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-03-20 19:09:04 +01:00
Daniel Calviño Sánchez
8af9c553e6 Add tests for exact search results already shared with 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-03-20 19:09:04 +01:00
Daniel Calviño Sánchez
375eab9df3 Add tests for emails and circles already shared with 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-03-20 19:09:04 +01:00
Daniel Calviño Sánchez
6fef01c481 Adjust search term to test 
As the server response is faked the search term is ignored in the tests.
However, it is clearer to use a search term that would make the server
return what the faked response contains.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-03-20 19:09:03 +01:00
Jan-Christoph Borchardt
ce7775acd0 Replace information icon with confirmation button in share input 
The confirmation button right now is just an icon; its behaviour will be
added in the following commits.

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2018-03-20 19:09:03 +01:00
Morris Jobke
29c551c88f
Merge pull request #8847 from nextcloud/ocs-api-userdetails 
Add userdetails to ocs api
 2018-03-20 18:12:25 +01:00
Joas Schilling
ec1e039790
Show EOL warning in the update section 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-20 15:52:30 +01:00
Joas Schilling
64feb3f391
Merge pull request #8861 from nextcloud/rakekniven-patch-1 
Update ThemingController.php
 2018-03-20 13:45:20 +01:00
Roeland Jago Douma
99abe3bc8e
Merge pull request #8864 from nextcloud/ocs-allow-empty-email-displayname 
Allow empty emails provisioning api
 2018-03-20 09:44:38 +01:00
Roeland Jago Douma
16ae91330c
Merge pull request #8887 from nextcloud/fix-appmenu-min-width 
Add min width of two icons to the app menu
 2018-03-20 08:03:52 +01:00
Nextcloud bot
615258ba26
[tx-robot] updated from transifex 2018-03-20 01:11:33 +00:00
blizzz
7ae42f1f5d
Merge pull request #8822 from nextcloud/fix/8641/undefined-index 
the FN is optional, carrying the displayname if present
 2018-03-19 17:57:12 +01:00
Julius Härtl
1699b119dd
Add min width of two icons to the app menu 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-03-19 17:12:59 +01:00
John Molakvoæ (skjnldsv)
24659342f5
fixup! Check if groups is array, return empty do not throw 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-03-19 15:12:32 +01:00
rakekniven
789221a0fc
Update ThemingControllerTest.php 
Adjusted test
 2018-03-19 15:07:49 +01:00
rakekniven
d88db9b496
Update ThemingController.php 
Changed file according to discussion on PR.
 2018-03-19 15:00:27 +01:00
Roeland Jago Douma
796b4f19f8
Add Cache-control: immutable 
Cache generated CSS forever!
Also cache combined JS forever
Fix tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-19 14:21:53 +01:00
Roeland Jago Douma
734cddfa97
Merge pull request #8880 from nextcloud/delete_unused_download 
Remove unused download.php
 2018-03-19 14:18:51 +01:00
Roeland Jago Douma
1c1608cddb
Merge pull request #8871 from nextcloud/3rdparty-bump-openstack-3-0-5 
[3rdparty] Bump php-opencloud/openstack to 3.0.5
 2018-03-19 14:18:27 +01:00
Roeland Jago Douma
ce0c896d8f
Merge pull request #8881 from nextcloud/setUserValue_opt 
Store setUserValue as string in cache
 2018-03-19 14:17:59 +01:00
Roeland Jago Douma
431750828e
Store setUserValue as string in cache 
We cache the values we set in the setUserValue function.
However since the values are strings in the database we check if a value
is equal with string comparison

Now if the function was called with a $value of int or float. It would
be stored in the DB (and thus converted to string) and in the cache (not
converted thus as int/float).

Now if another call comes in that sets it to the same value (I'm looking
at you LDAP!). The check would fail since we would be comparing
int/float to string which fails by definition.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-19 12:57:48 +01:00
Roeland Jago Douma
9834f33d56
Merge pull request #8878 from nextcloud/remove_tmpfile 
Remove deprecated tmpFile/tmpFolder
 2018-03-19 12:29:08 +01:00
Roeland Jago Douma
0929e048f8
Merge pull request #8879 from nextcloud/dep_json 
Remove unused deprecated functions from OCP\JSON
 2018-03-19 12:28:23 +01:00
Roeland Jago Douma
1d6a2a7019
Remove unused download.php 
There were two routes apps/files/ajax/download.php but apparently also
apps/files/download.php I could not find any use of it.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-19 11:45:48 +01:00
Roeland Jago Douma
68871caf3c
Remove unused private function 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-19 11:32:10 +01:00
Roeland Jago Douma
d984c8d633
Remove unused deprecated functions from OCP\JSON 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-19 11:30:35 +01:00
Roeland Jago Douma
05203e3fc0
Merge pull request #8877 from nextcloud/deprecated_bgj_delete 
Remove old deprecated function from the BackgroundJob
 2018-03-19 11:25:45 +01:00
Roeland Jago Douma
17bfa1c74e
Merge pull request #8815 from nextcloud/channel-description 
Provide a description of the update channels inline
 2018-03-19 11:25:15 +01:00
Roeland Jago Douma
1088068c60
Remove \OCP\Files::tmpFolder 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-19 10:54:39 +01:00
Roeland Jago Douma
47a3008141
Remove \OCP\Files::tmpFile 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-19 10:52:35 +01:00
Roeland Jago Douma
d304f4bebb
Remove old deprecated function from the BackgroundJob 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-19 10:47:31 +01:00
Roeland Jago Douma
ba611594b7
[3rdparty] Bump php-opencloud/openstack to 3.0.5 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-19 10:28:33 +01:00
Morris Jobke
63bc633d89
Merge pull request #8857 from nextcloud/swift-verify-cached-token 
verify cached swift token
 2018-03-19 10:10:04 +01:00
Nextcloud bot
2fab6b2620
[tx-robot] updated from transifex 2018-03-19 01:11:34 +00:00
Nextcloud bot
d6bfc98df1
[tx-robot] updated from transifex 2018-03-18 01:11:46 +00:00
John Molakvoæ (skjnldsv)
ccd57ce1b1
Allow empty emails provisionning api 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-03-17 12:18:22 +01:00
Nextcloud bot
3cac7911d5
[tx-robot] updated from transifex 2018-03-17 01:11:30 +00:00
Morris Jobke
9aced256c2
Merge pull request #8853 from nextcloud/remove-resolve-reshare 
Remove unused resolveReshare of old sharing code
 2018-03-16 20:23:01 +01:00
rakekniven
b2ceb29484
Update ThemingController.php 
Changed wording according to discussion at Transifex. See https://www.transifex.com/nextcloud/nextcloud/translate/#de/$/121491259?issue=yes
Aligned ending of error messages
 2018-03-16 18:45:20 +01:00
blizzz
e56759917b
Merge pull request #8843 from nextcloud/set-share-with-field-to-the-id-of-the-circle 
Set "share with" field to the ID of the circle
 2018-03-16 16:42:31 +01:00
John Molakvoæ (skjnldsv)
2493e9426d
Check if groups is array, return empty do not throw 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-03-16 15:32:36 +01:00
Robin Appelman
41954d2903
verify cached swift token 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-03-16 15:20:16 +01:00
Morris Jobke
ade05f40ec
Remove unused resolveReshare of old sharing code 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-16 12:26:38 +01:00
John Molakvoæ (skjnldsv)
f5137fef6c
Fixed tests and improved code 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-03-16 11:44:20 +01:00
John Molakvoæ (skjnldsv)
aa1e8713fb
Fixed throw error on unreachable users 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-03-16 09:38:09 +01:00