9abbd6ab13
Revert "Proof of concept #5593 - inline SVG icon for icon-contacts"
2017-08-03 17:27:24 +02:00
ac4927809c
Merge branch 'master' into clean-settings-layout
2017-08-03 15:07:42 +02:00
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
7284458e24
Clean up HTML structure, fix labels.
...
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-08-03 12:51:27 +02:00
21dd85678f
[tx-robot] updated from transifex
2017-08-03 00:08:06 +00:00
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
45d080d70e
Merge pull request #5951 from nextcloud/use-public-method
...
Use public API instead of private
2017-08-02 09:27:34 +02:00
2800e017de
[tx-robot] updated from transifex
2017-08-02 00:08:10 +00:00
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
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
6010c4f267
Merge pull request #5877 from nextcloud/typehint_middleware
...
Prop argument type for Middleware
2017-08-01 14:28:16 +02:00
a69bbd7ffb
Update server.php
...
Typo: tips and tRicks ...
Signed-off-by: Jos Poortvliet <jospoortvliet@gmail.com>
2017-08-01 10:19:01 +02:00
c25e782dd6
Fix settings/Controller/
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 08:20:15 +02:00
d321e9792e
Add |null to PHPDoc
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 08:20:15 +02:00
084bac3530
Return '0' instead of null
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 08:20:15 +02:00
e1f52fc901
Stricter phan config fixes
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 08:20:13 +02:00
456392e627
[tx-robot] updated from transifex
2017-08-01 00:08:26 +00:00
3548603a88
Fix middleware implementations signatures
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-31 16:54:19 +02:00
97d06a7698
[tx-robot] updated from transifex
2017-07-31 00:08:02 +00:00
98b664a000
[tx-robot] updated from transifex
2017-07-30 00:08:03 +00:00
b43abf7512
[tx-robot] updated from transifex
2017-07-29 00:08:31 +00:00
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
65ade4b6d5
[tx-robot] updated from transifex
2017-07-27 00:08:03 +00:00
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
da31a30edb
[tx-robot] updated from transifex
2017-07-26 00:08:06 +00:00
11e182fff2
[tx-robot] updated from transifex
2017-07-25 00:08:02 +00:00
6d4731024a
Some app fixes of phpstorm inspections
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-24 11:42:07 +02:00
25ada8208d
Merge branch 'clean-settings-layout' of https://github.com/andreasjacobsen93/server into clean-settings-layout
2017-07-24 10:15:01 +02:00
35494703f3
Fixed bug with sharing-settings
...
Signed-off-by: Andreas Jacobsen <andreasjacobsen93@gmail.com>
2017-07-24 10:14:57 +02:00
d95b46ffb7
[tx-robot] updated from transifex
2017-07-24 00:08:01 +00:00
46332b0d8e
[tx-robot] updated from transifex
2017-07-23 00:07:58 +00:00
ce7c62d9bb
[tx-robot] updated from transifex
2017-07-22 00:08:07 +00:00
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
964d5338dc
[tx-robot] updated from transifex
2017-07-21 00:08:06 +00:00
26c42d3d30
[tx-robot] updated from transifex
2017-07-20 00:08:04 +00:00
0ee83ac56b
[tx-robot] updated from transifex
2017-07-19 00:08:22 +00:00
ac5d238ffe
Merge pull request #5758 from nextcloud/comradekingu-patch-7
...
Spelling: ": Bigversal"
2017-07-18 09:06:34 +02:00
b1b843e572
[tx-robot] updated from transifex
2017-07-18 00:08:02 +00:00
9b0cb57e3b
: Bigversal
2017-07-18 00:05:01 +02:00
118f0d2b4d
Merge branch 'master' into clean-settings-layout
2017-07-15 09:33:24 +02:00
84eb18b011
Personal settings file changed
2017-07-15 09:30:38 +02:00
a23cdd04bb
[tx-robot] updated from transifex
2017-07-15 00:08:54 +00:00
b0e83e17bb
Updated layout
...
Signed-off-by: Andreas Jacobsen <andreasjacobsen93@gmail.com>
2017-07-14 11:46:12 +02:00
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
91651cfbb9
Moved settings to left
...
Signed-off-by: Andreas Jacobsen <andreasjacobsen93@gmail.com>
2017-07-14 09:43:19 +02:00
3865c77279
[tx-robot] updated from transifex
2017-07-14 00:08:37 +00:00
261513b04a
[tx-robot] updated from transifex
2017-07-13 00:08:31 +00:00
13295c2d1d
[tx-robot] updated from transifex
2017-07-12 00:08:43 +00:00
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
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
04edde5bbd
Spelling: No "we" for recommendations.
2017-07-10 11:04:28 +02:00
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
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
4f7fafb5c5
[tx-robot] updated from transifex
2017-07-10 00:08:41 +00:00
6adda3ffe8
Spelling: No shouting at user, and Facebook
2017-07-09 16:30:56 +02:00
cf8db31bce
[tx-robot] updated from transifex
2017-07-09 00:08:31 +00:00
f59062ce83
[tx-robot] updated from transifex
2017-07-08 00:08:27 +00:00
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
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
d23bc9a99a
[tx-robot] updated from transifex
2017-07-07 00:08:24 +00:00
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
984953ef4a
[tx-robot] updated from transifex
2017-07-06 00:08:44 +00:00
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
7d58bb7db5
Merge pull request #5342 from nextcloud/userlist-used-space
...
show used space in user list
2017-07-05 15:15:25 +02:00
1cbb7a18d8
[tx-robot] updated from transifex
2017-07-05 00:08:26 +00:00
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
da6dd4898a
Move sync client to the firstrunwizard app
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-04 10:54:13 +02:00
d772edaff2
[tx-robot] updated from transifex
2017-07-04 00:08:24 +00:00
c94dbddd12
[tx-robot] updated from transifex
2017-07-03 00:08:21 +00:00
cc4373c901
[tx-robot] updated from transifex
2017-07-02 00:08:14 +00:00
d49276082e
[tx-robot] updated from transifex
2017-07-01 00:08:28 +00:00
2afb4857cc
[tx-robot] updated from transifex
2017-06-30 00:08:23 +00:00
72d3bfcf56
Merge pull request #4890 from nextcloud/unify-settings
...
Unify settings
2017-06-29 20:02:09 +02:00
f6e5718040
Update for settings
...
Signed-off-by: Andreas Jacobsen <andreasjacobsen93@gmail.com>
2017-06-29 12:28:36 +02:00
928b6a376e
[tx-robot] updated from transifex
2017-06-29 00:08:26 +00:00
b55c7032ad
Added space between avatar and settings
...
Signed-off-by: Andreas Jacobsen <andreasjacobsen93@gmail.com>
2017-06-28 18:26:50 +02:00
b4e05e8c58
Fixed typos
2017-06-28 14:27:08 +02:00
fe84dc73a8
Cleaned up personal settings page
...
Signed-off-by: Andreas Jacobsen <andreasjacobsen93@gmail.com>
2017-06-28 13:13:11 +02:00
045d04332e
[tx-robot] updated from transifex
2017-06-28 00:08:18 +00:00
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
3b80b72c04
[tx-robot] updated from transifex
2017-06-27 00:08:17 +00:00
6e52c8a794
[tx-robot] updated from transifex
2017-06-26 00:08:31 +00:00
665ded38aa
[tx-robot] updated from transifex
2017-06-25 00:08:18 +00:00
4526b8d6a3
[tx-robot] updated from transifex
2017-06-24 00:08:29 +00:00
d881a3c37b
adapt to force language changes
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 13:15:08 +02:00
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
f6ecc46cfa
adapt twofactore_backupcodes
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:38:05 +02:00
8a8e78d439
already declared in Trait
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:38:05 +02:00
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
e8f5c21db9
Fix trait usage
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-06-23 12:37:42 +02:00
f873182965
remove obsolete files
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:37:41 +02:00
3dca4de8b3
add Additional (+ Fallback) section for Personal settings
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:36:38 +02:00
d56e86cfde
sync clients have their own place
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:36:38 +02:00
8c076e0bda
take over app passwords
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:36:38 +02:00
489ac4391b
convert Sessions section
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:36:38 +02:00
8bd887b2c6
add storage info, fix URL generation
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:36:38 +02:00
045f652ef2
completing PersonalInfo
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:36:37 +02:00
039ee7e3aa
brief, incomplete personal info settings implementation
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:36:37 +02:00
560ab2e911
one settings link, common template, styling
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:36:37 +02:00
247b305b79
add route and controller. consolidate common settings functions in a trait.
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:36:17 +02:00
d9beeaec90
Merge pull request #5508 from nextcloud/no-activity-before-login
...
Don't create activities for email and password change before login
2017-06-23 12:04:49 +02:00
c935f1f9cc
[tx-robot] updated from transifex
2017-06-23 00:09:12 +00:00
c50cb6ad81
Don't create activities for email and password change before login
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-22 09:02:12 +02:00
7816c54625
Allow to force a language and set it via the ocs api
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-21 11:34:52 +02:00
146c699eb4
[tx-robot] updated from transifex
2017-06-21 00:08:15 +00:00
90fa27694a
Use PNG version of the icons for shipped activities
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-20 13:48:51 +02:00
e30ed1de84
Also allow group admins to toogle the storage location
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-20 10:35:22 +02:00
2660a3b49c
[tx-robot] updated from transifex
2017-06-20 00:08:41 +00:00
35413d9912
Don't try to save the setting when its not an admin
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-19 12:55:00 +02:00
76d10bc46b
[tx-robot] updated from transifex
2017-06-19 00:08:20 +00:00
26d6c4a64a
[tx-robot] updated from transifex
2017-06-17 00:08:26 +00:00
74654288e6
[tx-robot] updated from transifex
2017-06-16 00:08:44 +00:00
2e8e6f95b9
show used space in user list
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-06-15 14:06:54 +02:00
7a269ae872
[tx-robot] updated from transifex
2017-06-15 00:08:40 +00:00
e62e7a201d
Use translated Hint instead of english error on password policy
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-14 12:17:16 +02:00
8760abae63
Revert "allow admin to disable groups on personal page"
...
This reverts commit 28e1a9da6c#5259
2017-06-13 10:43:21 -05:00
ea64cb0028
[tx-robot] updated from transifex
2017-06-13 00:08:22 +00:00
aa243376ef
Merge pull request #5271 from nextcloud/use-mailer-to-create-email-template
...
Also use IMailer interface to generate the email template
2017-06-12 17:52:52 -05:00
56adbb4e1d
[docs] remove useless TODO mark
2017-06-12 11:19:31 +02:00
5feabd4634
[fix] Highlight 'everyone' group by default
2017-06-12 10:14:18 +02:00
08702cbaba
[tx-robot] updated from transifex
2017-06-11 00:08:21 +00:00
bfbbc57025
Remove unneeded CSS
...
* was removed with #5166 so there is no more apppasswords-section
Signed-off-by: Marius Blüm <marius@lineone.io>
2017-06-10 21:50:25 +02:00
b2892274fc
[tx-robot] updated from transifex
2017-06-10 00:08:38 +00:00
0433c4e4cf
Merge pull request #5118 from nextcloud/use-language-of-recipient-not-admin
...
Use the language of the recipient not the actor
2017-06-09 11:34:08 +02:00
628284a34c
[tx-robot] updated from transifex
2017-06-09 00:08:24 +00:00
3384c5fb70
Merge pull request #5287 from nextcloud/personal-page-gs-mode
...
show input fields if they are not empty but disable them in global scale mode
2017-06-08 15:03:58 +02:00
a74901fce1
[tx-robot] updated from transifex
2017-06-08 00:08:26 +00:00
3ad4a2839f
Allow to change avatar when groups are disables
...
* password form overlaps upload button and doesn't allow to click it
* regression from #5259
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
make sure that we always clear all floating rules after the user settings parts
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-07 11:27:27 -05:00
1ad4268046
unify look of disabled display name / email address and the other input fields
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-07 18:07:53 +02:00
f5731e1ba4
show input fields if they are not empty but disable them in global scale mode
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-07 17:13:29 +02:00
3678be045e
Merge pull request #5267 from nextcloud/personal-sessions-renamwe
...
reword sessions to security in personal settings
2017-06-07 10:11:08 +02:00
a3c5d43cd5
[tx-robot] updated from transifex
2017-06-07 00:09:00 +00:00
72235064fb
Merge pull request #5259 from nextcloud/disable-groups-on-personal-page
...
allow admin to disable groups on personal page
2017-06-06 11:30:08 -05:00
b58928b4c1
Also use IMailer interface to generate the email template
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-06 10:47:48 -05:00
340fdc1e70
reword sessions to security in personal settings
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-06-06 15:25:28 +02:00
15314b6f5b
Merge pull request #5223 from nextcloud/do-not-allow-to-set-invisible-fields
...
Don't allow the user to set fields they can't see
2017-06-06 08:06:39 -05:00
3ed8ad1584
Bring back the description for app passwords
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-06 13:44:37 +02:00
28e1a9da6c
allow admin to disable groups on personal page
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-06 09:58:52 +02:00
c092b33466
Merge pull request #5166 from nextcloud/feature/merge-sessions-app-passwords-list
...
Combine sessions and app passwords view into one single view
2017-06-05 23:04:06 -05:00
f03d6f225e
[tx-robot] updated from transifex
2017-06-04 00:08:29 +00:00
5d39f700e4
[tx-robot] updated from transifex
2017-06-03 00:09:00 +00:00
19041ed1a8
Also cover the settings endpoint
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-02 12:31:37 +02:00
74fccf20c8
Merge pull request #5084 from nextcloud/useful-gs-settings
...
add new config switched for the global scale architecture
2017-06-02 10:58:43 +02:00
c70de161cf
[tx-robot] updated from transifex
2017-06-02 00:08:30 +00:00
8801b68d45
[tx-robot] updated from transifex
2017-06-01 00:08:38 +00:00
5f9cc5a2d5
[tx-robot] updated from transifex
2017-05-31 00:08:48 +00:00
593f6281dc
Combine sessions and app passwords view into one single view
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-05-30 09:54:10 +02:00
b9b7f8bede
[tx-robot] updated from transifex
2017-05-30 00:08:44 +00:00
7c2d473d76
add new config switched for the global scale architecture
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-05-29 18:19:28 +02:00
4be17dff0f
[tx-robot] updated from transifex
2017-05-29 00:08:33 +00:00
Joas Schilling
Morris Jobke
Marin Treselj
Nextcloud bot
Lukas Reschke
Jos Poortvliet
Roeland Jago Douma
Andreas Jacobsen
Marcel Waldvogel
Roeland Jago Douma
Allan Nordhøy
Andreas Jacobsen
Bjoern Schiessle
Daniel Calviño Sánchez
Arthur Schiwon
Robin Appelman
m4dz
Marius Blüm
Christoph Wurst