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

9627 commits

Author SHA1 Message Date
Nextcloud bot
52f24b50f5
[tx-robot] updated from transifex 2019-08-07 02:14:38 +00:00
John Molakvoæ
9dbed95b4b
Fix ie app menu loading click (#16667) 
Fix ie app menu loading click
 2019-08-06 19:58:40 +02:00
John Molakvoæ (skjnldsv)
287393609d Fix ie app menu loading click 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-08-06 16:17:00 +00:00
Marco Ambrosini
70eeb9df4e prevent the server's app-navigation's css to overrule the scoped css in vue components 
Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
 2019-08-06 08:45:19 +02:00
Roeland Jago Douma
e4b7d02bef
Merge pull request #16651 from nextcloud/dependabot/npm_and_yarn/webpack-4.39.1 
Bump webpack from 4.38.0 to 4.39.1
 2019-08-04 22:48:37 +02:00
dependabot-preview[bot]
b84b78d203 Bump webpack from 4.38.0 to 4.39.1 
Bumps [webpack](https://github.com/webpack/webpack) from 4.38.0 to 4.39.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.38.0...v4.39.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-08-04 07:57:44 +00:00
Nextcloud bot
4327d275c1
[tx-robot] updated from transifex 2019-08-04 02:15:22 +00:00
Nextcloud bot
bfcc3acc9a
[tx-robot] updated from transifex 2019-08-03 02:14:32 +00:00
Nextcloud bot
67f90cb682
[tx-robot] updated from transifex 2019-08-02 02:14:30 +00:00
John Molakvoæ
a0a43de499
Merge pull request #16622 from nextcloud/design/scrollbar 
Standardize scrollbar color and width across Webkit and Firefox
 2019-08-01 14:57:14 +02:00
Nextcloud bot
a1afdac31a
[tx-robot] updated from transifex 2019-08-01 02:15:27 +00:00
Jan-Christoph Borchardt
c92e6192a5
Standardize scrollbar color and width across Webkit and Firefox 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-07-31 18:36:39 +02:00
Roeland Jago Douma
436f7b92d5
Merge pull request #16544 from nextcloud/bugfix/16540 
Add missing password reset page to vue
 2019-07-31 11:02:20 +02:00
Julius Härtl
3b0d13944a
Move actual password reset to vue 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-07-31 09:19:07 +02:00
Nextcloud bot
74eb2894a7
[tx-robot] updated from transifex 2019-07-30 02:14:45 +00:00
Morris Jobke
ec7e837d6a
Merge pull request #16563 from nextcloud/enh/lostcontroller/better_exceptions 
Use proper exception in lostController
 2019-07-29 10:42:36 +02:00
Morris Jobke
ef86346886
Merge pull request #16571 from nextcloud/enh/update_preview_controller 
Update PreviewController
 2019-07-29 10:35:08 +02:00
Nextcloud bot
57f2ea22c7
[tx-robot] updated from transifex 2019-07-29 02:14:59 +00:00
Roeland Jago Douma
d6bb26140d
Merge pull request #16573 from nextcloud/fix-default-timeouts-in-oc-notification 
Fix default timeouts in OC.Notification
 2019-07-28 20:57:31 +02:00
Nextcloud bot
b481750d00
[tx-robot] updated from transifex 2019-07-28 02:15:26 +00:00
Roeland Jago Douma
b6dd2ebd39
Use proper exception in lostController 
There is no need to log the expcetion of most of the stuff here.
We should properly log them but an exception is excessive.

This moves it to a proper exception which we can catch and then log.
The other exceptions will still be fully logged.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-07-27 20:12:16 +02:00
Daniel Calviño Sánchez
abd5d10253 Add unit tests for "OC.Notification.hide()" 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-07-26 18:46:59 +02:00
Daniel Calviño Sánchez
03f2e8a10e Fix default timeouts in OC.Notification 
When no timeout was given "show()" used the default timeout of
"OCP.Toast", which is 7 seconds instead of indefinitely as stated in the
documentation of "show()". "showHtml()" should also indefinitely show
the notification if no timeout is given, but due to the strict
comparison the notification was indefinitely shown only when a timeout
of 0 was explicitly given. Now both methods show the notification
indefinitely (or until it is explicitly hidden) when no timeout is
given.

The unit tests did not catch this error because "showHtml()" had no
tests (as before the move to Toastify it was called from "show()" and
thus implicitly tested), and because "show()" verified that "hide()" was
not called after some time; "hide()" is no longer called from "show()"
since "OCP.Toast" is used internally, so the test always passed even if
the notification was indeed hidden. Now the test is based on whether the
element is found or not, and explicit tests were added too for
"showHtml()".

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-07-26 18:46:59 +02:00
Daniel Calviño Sánchez
14006b548e Fix mixed test for "show" and "showTemporary" 
"showTemporary()" when a timeout was given was being tested along with
the "show()" tests; now there are two separate tests when a timeout is
given, one for "showTemporary()" and one for "show()".

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-07-26 18:46:58 +02:00
Daniel Calviño Sánchez
2b1c80ea3f Check number of elements instead of if the jQuery object is defined 
Tje jQuery object created through "$('#testArea .toastify')" will be
always defined even if no elements were found, so the check does not
really work; instead, it should be checked the number of elements found.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-07-26 18:46:51 +02:00
Roeland Jago Douma
a2a53848b0
Update PreviewController 
The constructor is called with the userId. However if a user is not
logged in this is null. Which means that we get an exception instead of
this being handled gracefully in the middleware.

There are cleaner solutions. But this is the solution that is the
easiest to apply without lots of work and risk of breaking things
(handling the logged in middleware before initializing the controller
etc).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-07-26 17:37:11 +02:00
Nextcloud bot
0e54f59b24
[tx-robot] updated from transifex 2019-07-26 02:14:42 +00:00
Nextcloud bot
569cf31cd6
[tx-robot] updated from transifex 2019-07-25 02:14:40 +00:00
Julius Härtl
2e8d52f354
Remove files_texteditor from shipped apps 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-07-24 14:16:17 +02:00
Nextcloud bot
9a61d5fb72
[tx-robot] updated from transifex 2019-07-23 02:15:28 +00:00
Roeland Jago Douma
555a439c9a
Merge pull request #16487 from nextcloud/dependabot/npm_and_yarn/blueimp-md5-2.11.0 
Bump blueimp-md5 from 2.10.0 to 2.11.0
 2019-07-22 08:34:27 +02:00
Nextcloud bot
a024dcfc81
[tx-robot] updated from transifex 2019-07-22 02:15:59 +00:00
dependabot-preview[bot]
d002c7aae8 Bump blueimp-md5 from 2.10.0 to 2.11.0 
Bumps [blueimp-md5](https://github.com/blueimp/JavaScript-MD5) from 2.10.0 to 2.11.0.
- [Release notes](https://github.com/blueimp/JavaScript-MD5/releases)
- [Commits](https://github.com/blueimp/JavaScript-MD5/compare/v2.10.0...v2.11.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-07-21 18:52:07 +00:00
Nextcloud bot
9249a810fb
[tx-robot] updated from transifex 2019-07-21 02:15:10 +00:00
Morris Jobke
efaa0e4d47
Merge pull request #16470 from nextcloud/bugfix/noid/settings-menu-border-top_new 
Add border-top to settings menu when its open
 2019-07-20 11:30:43 +02:00
Nextcloud bot
602a48c411
[tx-robot] updated from transifex 2019-07-20 02:14:33 +00:00
Greta Doci
92e0a1ab63 Add border-top to settings menu when its open 
Signed-off-by: Greta Doci <gretadoci@gmail.com>
 2019-07-19 15:18:26 +02:00
Nextcloud bot
d35f4a7645
[tx-robot] updated from transifex 2019-07-19 02:14:56 +00:00
Morris Jobke
ab9207827b
Merge pull request #16420 from nextcloud/bugfix/noid/settings-menu-border-top 
Add border-top to settings menu when its open ref #16076
 2019-07-18 18:04:44 +02:00
Nextcloud bot
3d0e0f2353
[tx-robot] updated from transifex 2019-07-18 02:14:53 +00:00
Morris Jobke
5b604eaeab
Merge pull request #15040 from nextcloud/feature/13980/push-for-deleted-notifications 
Notifications overhaul
 2019-07-17 20:22:03 +02:00
Greta Doci
8e4b5d02f4 Add border-top to settings menu when its open ref #16076 
Signed-off-by: Greta Doci <gretadoci@gmail.com>
 2019-07-17 15:58:03 +02:00
Nextcloud bot
63276cd0ea
[tx-robot] updated from transifex 2019-07-17 02:15:32 +00:00
Joas Schilling
55f5bc79a1
Keep the old method as a fallback and adjust the tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-07-16 11:36:32 +02:00
Morris Jobke
03ad858841
Merge pull request #14228 from nextcloud/feature/noid/add-metadata-etag 
Add DB table to extend filecache with metadata etag, creation  and upload time
 2019-07-15 21:37:25 +02:00
Roeland Jago Douma
a3deb21bf4
Merge pull request #16334 from nextcloud/feature/noid/enterprise-logo 
Add enterprise logo
 2019-07-15 20:31:06 +02:00
Morris Jobke
60dcb1800c
Add DB table to extend filecache with metadata etag, creation time and upload time 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-07-15 16:58:44 +02:00
Morris Jobke
b732f51c10
Add enterprise logo 
Also set it as theming logo if the subscription is valid.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-07-15 16:45:53 +02:00
Joas Schilling
64f67818bc
Fix new core notifier 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-07-15 15:14:58 +02:00
Morris Jobke
c048c56411
Merge pull request #16369 from nextcloud/rename-parameter-in-ocp-toast-for-consistency-with-oc-notification 
Rename parameter in OCP.Toast for consistency with OC.Notification
 2019-07-15 10:20:04 +02:00