Nextcloud bot
a2e3c8ede5
[tx-robot] updated from transifex
2017-08-12 00:08:18 +00:00
Morris Jobke
c2f7396d6b
Merge pull request #6031 from nextcloud/master-5937
...
display error icon on non-success
2017-08-09 13:44:34 +02:00
Marin Treselj
09d77b8973
Display success and error icons
...
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-08-09 11:12:48 +02:00
Nextcloud bot
8549fcf6e4
[tx-robot] updated from transifex
2017-08-09 00:08:20 +00:00
Maxence Lange
efa062e5ff
display error icon on non-success
...
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-08-08 16:30:48 +02:00
Nextcloud bot
481002a00b
[tx-robot] updated from transifex
2017-08-08 00:08:10 +00:00
Nextcloud bot
eb2442b871
[tx-robot] updated from transifex
2017-08-06 00:08:24 +00:00
Nextcloud bot
21f2fe5cb9
[tx-robot] updated from transifex
2017-08-05 00:08:08 +00:00
Morris Jobke
90d8070da3
Merge branch 'master' into clean-settings-layout
2017-08-04 11:11:33 +02:00
Marin Treselj
54444110d9
Merge branch 'clean-settings-layout' of github.com:andreasjacobsen93/nextcloud-server into clean-settings-layout
2017-08-04 10:23:52 +02:00
Marin Treselj
a4d9845326
Fix federation icon menu and container paddings.
...
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-08-04 10:22:03 +02:00
Joas Schilling
9abbd6ab13
Revert "Proof of concept #5593 - inline SVG icon for icon-contacts"
2017-08-03 17:27:24 +02:00
Morris Jobke
ac4927809c
Merge branch 'master' into clean-settings-layout
2017-08-03 15:07:42 +02:00
Marin Treselj
7de9eb16d8
Reintroduce a more compact grid.
...
Overrides core `.section` values.
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-08-03 13:12:00 +02:00
Marin Treselj
7284458e24
Clean up HTML structure, fix labels.
...
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-08-03 12:51:27 +02:00
Nextcloud bot
21dd85678f
[tx-robot] updated from transifex
2017-08-03 00:08:06 +00:00
Marin Treselj
ffcdc96a0b
Proof of concept #5593 - inline SVG icon for icon-contacts
...
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-08-02 18:27:24 +02:00
Morris Jobke
45d080d70e
Merge pull request #5951 from nextcloud/use-public-method
...
Use public API instead of private
2017-08-02 09:27:34 +02:00
Nextcloud bot
2800e017de
[tx-robot] updated from transifex
2017-08-02 00:08:10 +00:00
Lukas Reschke
21d1d05667
Use public API instead of private
...
The private API here doesn't have the backends yet properly initialized, probably another bug but let's go with the easy bug fix here. Next step is to write integration tests and then figure out why changing this to the private API (which it actually calls) doesn't work.
Fixes https://github.com/nextcloud/server/issues/5950
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 18:19:28 +02:00
Lukas Reschke
f93a82b8b0
Remove explicit type hints for Controller
...
This is public API and breaks the middlewares of existing apps. Since this also requires maintaining two different code paths for 12 and 13 I'm at the moment voting for reverting this change.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 17:32:03 +02:00
Morris Jobke
6010c4f267
Merge pull request #5877 from nextcloud/typehint_middleware
...
Prop argument type for Middleware
2017-08-01 14:28:16 +02:00
Jos Poortvliet
a69bbd7ffb
Update server.php
...
Typo: tips and tRicks ...
Signed-off-by: Jos Poortvliet <jospoortvliet@gmail.com>
2017-08-01 10:19:01 +02:00
Lukas Reschke
c25e782dd6
Fix settings/Controller/
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 08:20:15 +02:00
Lukas Reschke
d321e9792e
Add |null to PHPDoc
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 08:20:15 +02:00
Lukas Reschke
084bac3530
Return '0' instead of null
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 08:20:15 +02:00
Lukas Reschke
e1f52fc901
Stricter phan config fixes
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 08:20:13 +02:00
Nextcloud bot
456392e627
[tx-robot] updated from transifex
2017-08-01 00:08:26 +00:00
Roeland Jago Douma
3548603a88
Fix middleware implementations signatures
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-31 16:54:19 +02:00
Nextcloud bot
97d06a7698
[tx-robot] updated from transifex
2017-07-31 00:08:02 +00:00
Nextcloud bot
98b664a000
[tx-robot] updated from transifex
2017-07-30 00:08:03 +00:00
Nextcloud bot
b43abf7512
[tx-robot] updated from transifex
2017-07-29 00:08:31 +00:00
Morris Jobke
63aa12e38c
Merge pull request #5895 from nextcloud/fix-password-change
...
Fix show password button for password change
2017-07-27 13:29:13 +02:00
Nextcloud bot
65ade4b6d5
[tx-robot] updated from transifex
2017-07-27 00:08:03 +00:00
Morris Jobke
8f0a0c805e
Fix show password button for password change
...
* fix the show password button on the personal page
* before: if the password change failed the show password icon was not shown again
* after: show password icon is visible
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-26 22:54:23 +02:00
Nextcloud bot
da31a30edb
[tx-robot] updated from transifex
2017-07-26 00:08:06 +00:00
Nextcloud bot
11e182fff2
[tx-robot] updated from transifex
2017-07-25 00:08:02 +00:00
Roeland Jago Douma
6d4731024a
Some app fixes of phpstorm inspections
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-24 11:42:07 +02:00
Andreas Jacobsen
25ada8208d
Merge branch 'clean-settings-layout' of https://github.com/andreasjacobsen93/server into clean-settings-layout
2017-07-24 10:15:01 +02:00
Andreas Jacobsen
35494703f3
Fixed bug with sharing-settings
...
Signed-off-by: Andreas Jacobsen <andreasjacobsen93@gmail.com>
2017-07-24 10:14:57 +02:00
Nextcloud bot
d95b46ffb7
[tx-robot] updated from transifex
2017-07-24 00:08:01 +00:00
Nextcloud bot
46332b0d8e
[tx-robot] updated from transifex
2017-07-23 00:07:58 +00:00
Nextcloud bot
ce7c62d9bb
[tx-robot] updated from transifex
2017-07-22 00:08:07 +00:00
Marcel Waldvogel
15c51f410e
The app password avoids 1Il etc. Adapted comment accordingly
...
Signed-off-by: Marcel Waldvogel <marcel.waldvogel@uni-konstanz.de>
2017-07-21 09:48:14 +02:00
Nextcloud bot
964d5338dc
[tx-robot] updated from transifex
2017-07-21 00:08:06 +00:00
Nextcloud bot
26c42d3d30
[tx-robot] updated from transifex
2017-07-20 00:08:04 +00:00
Nextcloud bot
0ee83ac56b
[tx-robot] updated from transifex
2017-07-19 00:08:22 +00:00
Roeland Jago Douma
ac5d238ffe
Merge pull request #5758 from nextcloud/comradekingu-patch-7
...
Spelling: ": Bigversal"
2017-07-18 09:06:34 +02:00
Nextcloud bot
b1b843e572
[tx-robot] updated from transifex
2017-07-18 00:08:02 +00:00
Allan Nordhøy
9b0cb57e3b
: Bigversal
2017-07-18 00:05:01 +02:00
Andreas Jacobsen
118f0d2b4d
Merge branch 'master' into clean-settings-layout
2017-07-15 09:33:24 +02:00
Andreas Jacobsen
84eb18b011
Personal settings file changed
2017-07-15 09:30:38 +02:00
Nextcloud bot
a23cdd04bb
[tx-robot] updated from transifex
2017-07-15 00:08:54 +00:00
Andreas Jacobsen
b0e83e17bb
Updated layout
...
Signed-off-by: Andreas Jacobsen <andreasjacobsen93@gmail.com>
2017-07-14 11:46:12 +02:00
Bjoern Schiessle
2f50ba92da
this template file is no longer needed
...
since https://github.com/nextcloud/server/pull/4890 the templates
are located at settings/templates/settings/personal/
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-14 11:38:21 +02:00
Andreas Jacobsen
91651cfbb9
Moved settings to left
...
Signed-off-by: Andreas Jacobsen <andreasjacobsen93@gmail.com>
2017-07-14 09:43:19 +02:00
Nextcloud bot
3865c77279
[tx-robot] updated from transifex
2017-07-14 00:08:37 +00:00
Nextcloud bot
261513b04a
[tx-robot] updated from transifex
2017-07-13 00:08:31 +00:00
Nextcloud bot
13295c2d1d
[tx-robot] updated from transifex
2017-07-12 00:08:43 +00:00
Morris Jobke
23ff76975f
Merge pull request #5662 from nextcloud/comradekingu-patch-1
...
Spelling: No shouting at user, and Facebook
2017-07-11 00:13:33 +02:00
Morris Jobke
7df7d0ff3b
Merge pull request #5656 from nextcloud/fix-unselecting-items-on-multi-select-dropdowns
...
Fix unselecting items on multi select dropdowns
2017-07-10 23:39:43 +02:00
Allan Nordhøy
04edde5bbd
Spelling: No "we" for recommendations.
2017-07-10 11:04:28 +02:00
Morris Jobke
c7b28064e3
Merge pull request #5649 from nextcloud/fix-5611
...
fix alignment of radio button and its label in encryption settings
2017-07-10 09:26:05 +02:00
Daniel Calviño Sánchez
46e813e749
Enable the toggleSelect extension in multi-select dropdowns
...
The toggleSelect extension for Select2 makes possible to unselect items
in a multi-select dropdown by clicking on them; this behaviour should be
enabled in all the multi-select dropdowns used in the server.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-07-10 03:38:22 +02:00
Nextcloud bot
4f7fafb5c5
[tx-robot] updated from transifex
2017-07-10 00:08:41 +00:00
Allan Nordhøy
6adda3ffe8
Spelling: No shouting at user, and Facebook
2017-07-09 16:30:56 +02:00
Nextcloud bot
cf8db31bce
[tx-robot] updated from transifex
2017-07-09 00:08:31 +00:00
Nextcloud bot
f59062ce83
[tx-robot] updated from transifex
2017-07-08 00:08:27 +00:00
Arthur Schiwon
c46006934c
fix alignment of radio button and its label in encryption settings
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-07-07 16:59:28 +02:00
Morris Jobke
b4deba2078
Merge pull request #5483 from nextcloud/issue-5075-png-files-for-activity-emails
...
Use PNGs for icons in activity emails
2017-07-07 11:05:00 +02:00
Nextcloud bot
d23bc9a99a
[tx-robot] updated from transifex
2017-07-07 00:08:24 +00:00
Bjoern Schiessle
1a55ace97c
no warning on password change if no encryption module uses per-user keys
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:11 +02:00
Nextcloud bot
984953ef4a
[tx-robot] updated from transifex
2017-07-06 00:08:44 +00:00
blizzz
75f97852b4
Merge pull request #5404 from nextcloud/use-translated-hint-insteadof-english-error
...
Use translated Hint instead of english error on password policy
2017-07-05 22:18:49 +02:00
Morris Jobke
7d58bb7db5
Merge pull request #5342 from nextcloud/userlist-used-space
...
show used space in user list
2017-07-05 15:15:25 +02:00
Nextcloud bot
1cbb7a18d8
[tx-robot] updated from transifex
2017-07-05 00:08:26 +00:00
Morris Jobke
8e160c6638
Merge pull request #5591 from nextcloud/move-client-info-to-firstrunwizard
...
Move sync client to the firstrunwizard app
2017-07-04 11:39:21 +02:00
Joas Schilling
da6dd4898a
Move sync client to the firstrunwizard app
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-04 10:54:13 +02:00
Nextcloud bot
d772edaff2
[tx-robot] updated from transifex
2017-07-04 00:08:24 +00:00
Nextcloud bot
c94dbddd12
[tx-robot] updated from transifex
2017-07-03 00:08:21 +00:00
Nextcloud bot
cc4373c901
[tx-robot] updated from transifex
2017-07-02 00:08:14 +00:00
Nextcloud bot
d49276082e
[tx-robot] updated from transifex
2017-07-01 00:08:28 +00:00
Nextcloud bot
2afb4857cc
[tx-robot] updated from transifex
2017-06-30 00:08:23 +00:00
blizzz
72d3bfcf56
Merge pull request #4890 from nextcloud/unify-settings
...
Unify settings
2017-06-29 20:02:09 +02:00
Andreas Jacobsen
f6e5718040
Update for settings
...
Signed-off-by: Andreas Jacobsen <andreasjacobsen93@gmail.com>
2017-06-29 12:28:36 +02:00
Nextcloud bot
928b6a376e
[tx-robot] updated from transifex
2017-06-29 00:08:26 +00:00
Andreas Jacobsen
b55c7032ad
Added space between avatar and settings
...
Signed-off-by: Andreas Jacobsen <andreasjacobsen93@gmail.com>
2017-06-28 18:26:50 +02:00
Andreas Jacobsen
b4e05e8c58
Fixed typos
2017-06-28 14:27:08 +02:00
Andreas Jacobsen
fe84dc73a8
Cleaned up personal settings page
...
Signed-off-by: Andreas Jacobsen <andreasjacobsen93@gmail.com>
2017-06-28 13:13:11 +02:00
Nextcloud bot
045d04332e
[tx-robot] updated from transifex
2017-06-28 00:08:18 +00:00
Arthur Schiwon
005ef115fb
move admin templates to the right place
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-27 12:25:37 +02:00
Nextcloud bot
3b80b72c04
[tx-robot] updated from transifex
2017-06-27 00:08:17 +00:00
Nextcloud bot
6e52c8a794
[tx-robot] updated from transifex
2017-06-26 00:08:31 +00:00
Nextcloud bot
665ded38aa
[tx-robot] updated from transifex
2017-06-25 00:08:18 +00:00
Nextcloud bot
4526b8d6a3
[tx-robot] updated from transifex
2017-06-24 00:08:29 +00:00
Arthur Schiwon
d881a3c37b
adapt to force language changes
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 13:15:08 +02:00
Arthur Schiwon
a596251d6b
avoid marking two sections as active when they have the same name
...
… in both personal and admin.
2017-06-23 12:38:06 +02:00
Arthur Schiwon
f6ecc46cfa
adapt twofactore_backupcodes
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:38:05 +02:00
Arthur Schiwon
8a8e78d439
already declared in Trait
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:38:05 +02:00
Arthur Schiwon
07cf046216
take over changes from #5166 and follow #5267
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:37:42 +02:00