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

4450 commits

Author SHA1 Message Date
Nextcloud bot
52a1760d4e
[tx-robot] updated from transifex 2017-11-02 01:10:52 +00:00
Jan-Christoph Borchardt
52b679a2d6
Merge pull request #6667 from nextcloud/settings-heading 
Adjust settings navigation headings to style used in Mail & Calendar
 2017-11-01 14:53:49 +01:00
Nextcloud bot
cc83052ca7
[tx-robot] updated from transifex 2017-11-01 01:08:44 +00:00
Nextcloud bot
5521937dc4
[tx-robot] updated from transifex 2017-10-30 01:08:34 +00:00
Nextcloud bot
65621141fd
[tx-robot] updated from transifex 2017-10-27 00:08:29 +00:00
Morris Jobke
13087da3c6 Merge pull request #6973 from nextcloud/menu-highlight 
Add blue bar as highlight to active menu entry
 2017-10-26 16:09:02 +02:00
Nextcloud bot
37bedbc10d
[tx-robot] updated from transifex 2017-10-26 00:08:39 +00:00
Nextcloud bot
c85deacddb
[tx-robot] updated from transifex 2017-10-25 00:08:45 +00:00
Jan-Christoph Borchardt
0aac62096c Add blue highlight to active menu entry 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-10-24 22:58:18 +02:00
Morris Jobke
b1f77aca4e Merge pull request #6919 from nextcloud/di-appmanager-encryption-migration 
Use DI for IAppManager to encryption migration
 2017-10-24 16:33:03 +02:00
Morris Jobke
99934134dc
Use DI for IAppManager to encryption migration 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-24 15:52:00 +02:00
Morris Jobke
3eaf23f29f Merge pull request #6920 from nextcloud/appmanager-usage 
Use appmanager instead of OC_App for check for enabled app
 2017-10-24 13:53:17 +02:00
Nextcloud bot
1860190305
[tx-robot] updated from transifex 2017-10-24 00:08:45 +00:00
Morris Jobke
f884e762bc
Use appmanager instead of OC_App for check for enabled app 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-23 23:31:17 +02:00
John Molakvoæ
59598b8a27 Merge pull request #6916 from nextcloud/css-box-sizing 
Box-sizing does not need vendor prefix anymore
 2017-10-23 21:13:17 +02:00
Morris Jobke
c2004afb4f
Box-sizing does not need vendor prefix anymore 
http://caniuse.com/#search=box-sizing

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-23 20:10:39 +02:00
John Molakvoæ
e5b619d0a6 Merge pull request #6848 from nextcloud/user-app-nav-to-css-guidelines 
User settings app-navigation to css guidelines
 2017-10-23 17:51:03 +02:00
Nextcloud bot
db1096bcfd
[tx-robot] updated from transifex 2017-10-23 00:08:39 +00:00
blizzz
cd80e5dc7c Merge pull request #6758 from nextcloud/allow-0-quota-again 
Allow quota of 0 again
 2017-10-22 14:10:55 +02:00
John Molakvoæ (skjnldsv)
2e38d0173d
Fix deletion feedback 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-10-21 21:10:48 +02:00
John Molakvoæ (skjnldsv)
f3d9961150
Fix editing form visibility 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-10-21 21:10:48 +02:00
John Molakvoæ (skjnldsv)
69f0f17f32
Edit form to guidelines 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-10-21 21:10:48 +02:00
John Molakvoæ (skjnldsv)
f4004d3ab8
User settings app-navigation to css guidelines 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-10-21 21:10:45 +02:00
Nextcloud bot
3709d3eeae
[tx-robot] updated from transifex 2017-10-21 00:08:26 +00:00
Nextcloud bot
a94976bfc8
[tx-robot] updated from transifex 2017-10-20 00:08:34 +00:00
Markus Staab
db34b59238 Prevent XSS in links which open a new browser window 2017-10-19 12:16:04 +02:00
Joas Schilling
6efa0b86d0
Allow quota of 0 again 
Regression from f1fccaca06

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-19 11:37:29 +02:00
Nextcloud bot
07b6e234bd
[tx-robot] updated from transifex 2017-10-19 00:08:27 +00:00
Joas Schilling
3119fd41ce
Set the data from the template 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-18 15:12:03 +02:00
Joas Schilling
8b37fe7f65
Set the subject with the email template to allow theming 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-18 15:12:03 +02:00
Nextcloud bot
8e884ba52f
[tx-robot] updated from transifex 2017-10-18 00:08:23 +00:00
Bjoern Schiessle
e964f83f28
fix url 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-10-17 11:24:01 +02:00
Nextcloud bot
59c3ea91fd
[tx-robot] updated from transifex 2017-10-17 00:08:23 +00:00
John Molakvoæ (skjnldsv)
f33ed5fb13
Ellipsis 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-10-14 10:37:17 +02:00
John Molakvoæ (skjnldsv)
4ca88471b0
Fix popover position and avatar loading 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-10-14 10:37:17 +02:00
Nextcloud bot
d251623b01
[tx-robot] updated from transifex 2017-10-14 02:29:04 +00:00
Nextcloud bot
7c1ba6c00b
[tx-robot] updated from transifex 2017-10-13 00:08:27 +00:00
John Molakvoæ (skjnldsv)
7f07ff48f2
Correct class to quota 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-10-12 11:07:07 +02:00
Nextcloud bot
adb847de41
[tx-robot] updated from transifex 2017-10-12 00:08:28 +00:00
Nextcloud bot
647b185c2b
[tx-robot] updated from transifex 2017-10-11 00:08:29 +00:00
Julius Härtl
bee9ef83c6
App management: Do not show udpdate category if no updates are available 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-10-10 12:34:38 +02:00
Julius Härtl
a3502c5c67
App management: Show proper message when no updates are available 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-10-10 12:34:38 +02:00
Julius Härtl
6f7fb2e87b
App management: do not reset update counter to 0 on category change 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-10-10 12:34:38 +02:00
Julius Härtl
8d1b32e597
App management: add update section 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-10-10 12:34:37 +02:00
Nextcloud bot
564d1b1789
[tx-robot] updated from transifex 2017-10-10 00:08:31 +00:00
Nextcloud bot
436daf92e5
[tx-robot] updated from transifex 2017-10-07 00:08:31 +00:00
Joas Schilling
66b4efe4c6 Merge pull request #6750 from nextcloud/fix-language-when-setting-password 
Fix language when trying to change password
 2017-10-04 15:51:23 +02:00
Joas Schilling
e9fd39f3dd
Fix language when trying to change password 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-04 09:47:52 +02:00
Julius Härtl
5c34b2d4bb
App management: add update availability to sorting 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-10-03 15:11:11 +02:00
Nextcloud bot
edf44ac9d9
[tx-robot] updated from transifex 2017-10-01 00:08:24 +00:00
Nextcloud bot
8be053516b
[tx-robot] updated from transifex 2017-09-30 00:08:25 +00:00
John Molakvoæ
d58c0e6834 Merge pull request #6669 from nextcloud/various-css-fixes 
Various css fixes
 2017-09-28 17:48:40 +02:00
Jan-Christoph Borchardt
d92310ac2b Adjust settings navigation heading style 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-09-28 13:29:37 +02:00
John Molakvoæ (skjnldsv)
7fb3292949
Popover to css guidelines 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-09-28 11:55:25 +02:00
John Molakvoæ (skjnldsv)
c1795b0611
Fix tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-09-28 11:12:52 +02:00
Nextcloud bot
e5d39e63d1
[tx-robot] updated from transifex 2017-09-28 00:08:36 +00:00
Morris Jobke
72889e57ca Merge pull request #6653 from nextcloud/fix-cursor-on-user-settings-table 
Fix cursor on user settings table
 2017-09-27 23:27:30 +02:00
John Molakvoæ (skjnldsv)
f09a70e9b5
Quota bar fix on user list 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-09-27 22:13:19 +02:00
John Molakvoæ (skjnldsv)
d54253d4e4
Implement progress theming into core and better visual on quota display 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-09-27 22:13:19 +02:00
John Molakvoæ (skjnldsv)
291e3d331f
No js for popover positionning 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-09-27 13:34:29 +02:00
Jan-Christoph Borchardt
d4f1518533 Fix style of federation scope menu triangles, simplify CSS 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-09-27 12:20:26 +02:00
Nextcloud bot
de2dc3c919
[tx-robot] updated from transifex 2017-09-27 00:08:23 +00:00
Daniel Calviño Sánchez
de3138104c Remove unneeded CSS rules 
There are currently no "img" or "span" descendants of "td.quota"
elements, so those rules can be removed.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-09-26 17:43:54 +02:00
Daniel Calviño Sánchez
401322bf61 Remove "cursor: pointer" from quota cell 
The quota is set through a dropdown, and this dropdown is only shown
when clicking on the select element itself. Therefore, the cell should
not show a pointer when hovering on it but outside the select element.

Note that although the removed "&.quota" selector also set a "width"
declaration that declaration was later overriden by
"#userlist td.quota", so it was not needed.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-09-26 17:43:25 +02:00
Daniel Calviño Sánchez
8363aceb74 Set "cursor: pointer" for email addresses 
Clicking anywhere on the cell shows the input field to set the email
address, so the cursor is set as a pointer not only on the text and
icon, but on the whole cell as well (like done for the full name and the
password).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-09-26 16:59:57 +02:00
Jan-Christoph Borchardt
a5c1e5f952 Highlight active federation scope menu entry with bold heading 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-09-26 15:08:17 +02:00
Nextcloud bot
ef3e8faea2
[tx-robot] updated from transifex 2017-09-26 00:08:26 +00:00
John Molakvoæ
9080976975 Merge pull request #6372 from nextcloud/scss-normalization 
Scss normalization
 2017-09-25 16:50:30 +02:00
John Molakvoæ (skjnldsv)
9ff6dab07c
Fix typo 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-09-25 13:07:18 +02:00
John Molakvoæ (skjnldsv)
308e1c0ed2
Icons & default classes 
Changed categories order same as app store

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-09-24 08:59:09 +02:00
John Molakvoæ (skjnldsv)
d169e3fd59
Removed unused filter for opacity, fix #6408 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-09-23 18:18:14 +02:00
John Molakvoæ (skjnldsv)
65353af374
Replaced colours by variables 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-09-23 18:17:44 +02:00
John Molakvoæ (skjnldsv)
a07299476b
Settings scss 
Scss conversion
Cleanup settings scss

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-09-23 18:17:26 +02:00
Nextcloud bot
887229b7b8
[tx-robot] updated from transifex 2017-09-22 00:08:22 +00:00
Joas Schilling
72bf1df7f7
Set the displayname for the avatar in the personal info 
Otherwise the color used is different

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-09-20 21:39:12 +02:00
Nextcloud bot
efbd3bb518
[tx-robot] updated from transifex 2017-09-20 00:08:25 +00:00
Nextcloud bot
d603d78630
[tx-robot] updated from transifex 2017-09-19 00:08:27 +00:00
Morris Jobke
8b1eaba417 Merge pull request #5585 from nextcloud/contacts_menu_privacy 
Enhance privacy of contactsmenu fixes #5107
 2017-09-18 14:25:16 +02:00
Nextcloud bot
60e0de4a36
[tx-robot] updated from transifex 2017-09-18 00:08:32 +00:00
Nextcloud bot
cdb6b0295a
[tx-robot] updated from transifex 2017-09-17 00:08:25 +00:00
Nextcloud bot
967b563113
[tx-robot] updated from transifex 2017-09-16 00:08:23 +00:00
Morris Jobke
bb9493e9ad Merge pull request #6521 from nextcloud/fix-margin-settings 
Fix margins of followup sections
 2017-09-15 16:49:11 +02:00
Morris Jobke
034011465d
Fix margins of followup sections 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-09-15 15:58:06 +02:00
Lukas Reschke
705432ca6f
Add filter for shareapi_allow_share_dialog_user_enumeration 
This adjusts the contacts menu to also support searching by email address which is relevant in scenarios where no UID is known such as LDAP, etc.

Furthermore, if `shareapi_allow_share_dialog_user_enumeration` is disabled only results are shown that match the full user ID or email address.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-09-15 15:58:04 +02:00
Nextcloud bot
113fd47f30
[tx-robot] updated from transifex 2017-09-15 00:08:08 +00:00
Nextcloud bot
5ce3c7003b
[tx-robot] updated from transifex 2017-09-13 00:08:12 +00:00
Nextcloud bot
c124a43d74
[tx-robot] updated from transifex 2017-09-12 00:08:25 +00:00
Lukas Reschke
038ae39f13 Merge pull request #6439 from nextcloud/fix-5960-sort-apps-ignore-level 
Sort apps by enabled/disabled but not by official/in-appstore in App Management
 2017-09-11 22:17:21 +02:00
Chon Kou
d5cfb38449 Sort apps by enabled/disabled but not by official/in-appstore in App Management 
Signed-off-by: Chon Kou <k.kou@alumni.ubc.ca>
 2017-09-10 20:50:22 -07:00
Nextcloud bot
4b38dac1b8
[tx-robot] updated from transifex 2017-09-11 00:08:19 +00:00
Nextcloud bot
3f6692ee24
[tx-robot] updated from transifex 2017-09-10 00:08:23 +00:00
Nextcloud bot
25f2546a7b
[tx-robot] updated from transifex 2017-09-09 00:08:19 +00:00
Morris Jobke
c27b2f8dcf Merge pull request #6413 from nextcloud/translate-settings-headers 
Translate settings headers
 2017-09-08 18:49:43 +02:00
Morris Jobke
e9c713902e Merge pull request #6417 from nextcloud/proper-english-nowhave 
Improve text: 'you have now' -> 'you now have'
 2017-09-08 18:29:22 +02:00
Leon Klingele
8e46e6b827
Improve text: 'you have now' -> 'you now have' 
Signed-off-by: Leon Klingele <leon@struktur.de>
 2017-09-08 13:47:11 +02:00
Joas Schilling
758b2baa43
Translate settings headers 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-09-08 10:22:14 +02:00
Nextcloud bot
194f880073
[tx-robot] updated from transifex 2017-09-08 00:08:16 +00:00
Joas Schilling
5a257cec63
Make sure the password contains special characters 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-09-07 12:47:55 +02:00
Nextcloud bot
9959560649
[tx-robot] updated from transifex 2017-09-07 00:08:23 +00:00
Lukas Reschke
033d2de002
Properly include file 
Regression from 005ef115fb

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-09-06 15:35:38 +02:00
Nextcloud bot
9d930210ee
[tx-robot] updated from transifex 2017-09-06 00:08:21 +00:00
Morris Jobke
15cd21d252 Merge pull request #6358 from nextcloud/fix-mixup-of-id-and-name 
Set the meta data before everything
 2017-09-05 16:08:57 +02:00
Joas Schilling
6dbb64c4a2
Merge setMetaData into constructor 
This ensures that the meta data is set in the beginning

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-09-04 15:07:41 +02:00
Joas Schilling
95ecab0356
Set the meta data before everything 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-09-04 14:46:05 +02:00
Morris Jobke
d21713d526 Merge pull request #6334 from nextcloud/fix-mixup-of-id-and-name 
Fix naming of user id in email meta data
 2017-09-04 11:43:41 +02:00
Nextcloud bot
27c6dc9657
[tx-robot] updated from transifex 2017-09-02 00:08:29 +00:00
Joas Schilling
e47d627fc4
Fix naming of user id in email meta data 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-09-01 15:04:17 +02:00
Morris Jobke
77354cb7a2 Merge pull request #6315 from nextcloud/metadata-for-all-emails 
Implement metadata for email templates of remaining emails
 2017-08-31 09:54:31 +02:00
Nextcloud bot
99dcf5036d
[tx-robot] updated from transifex 2017-08-31 00:08:31 +00:00
Morris Jobke
404bd1be60
Implement metadata for email templates of remaining emails 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-30 22:56:14 +02:00
Morris Jobke
ee14659ae8 Merge pull request #6216 from nextcloud/allow-to-sort-groups-by-name 
Allow to sort groups by name
 2017-08-30 22:01:10 +02:00
Nextcloud bot
1e24fe858a
[tx-robot] updated from transifex 2017-08-30 00:08:26 +00:00
Nextcloud bot
daf2d6cb96
[tx-robot] updated from transifex 2017-08-29 00:08:27 +00:00
Nextcloud bot
7b8bd8188e
[tx-robot] updated from transifex 2017-08-25 00:08:59 +00:00
Nextcloud bot
a7f2dc6dd6
[tx-robot] updated from transifex 2017-08-24 00:08:50 +00:00
Joas Schilling
48bdb1bec1
Allow to sort groups by name 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-22 14:36:00 +02:00
Nextcloud bot
ae0789ef43
[tx-robot] updated from transifex 2017-08-22 00:08:20 +00:00
Morris Jobke
c134afee40 Use correct l10n for app password menu 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-21 09:18:49 +02:00
Nextcloud bot
9e1884b27c
[tx-robot] updated from transifex 2017-08-21 00:08:13 +00:00
Nextcloud bot
8c458de4c2
[tx-robot] updated from transifex 2017-08-20 00:08:15 +00:00
Nextcloud bot
6b978ebd29
[tx-robot] updated from transifex 2017-08-19 00:08:26 +00:00
Nextcloud bot
231cffffb9
[tx-robot] updated from transifex 2017-08-18 00:08:15 +00:00
Lukas Reschke
e37cf2d6f0 Merge pull request #6158 from nextcloud/always-log-cron-execution 
Always log cron execution
 2017-08-17 11:14:12 +02:00
Morris Jobke
1c38a83927 Always log cron execution 
There was a setting to disable the last execution of cron. There is no known
problem with this write access and it was also questioned when this feature
was build in https://github.com/owncloud/core/pull/7689#issuecomment-38264707

Recently there was also a bug report about a non-visible last cron execution
(#6088) - let's better remove this.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-17 09:45:11 +02:00
Nextcloud bot
0ceb06fde5
[tx-robot] updated from transifex 2017-08-17 00:08:14 +00:00
Tobia De Koninck
23039e882f Fix group management which was broken since #5847 
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
 2017-08-15 17:47:54 +02:00
Roeland Jago Douma
e0f479a4eb Merge pull request #6098 from nextcloud/fix-federation-scope 
Fix federation scope dropdown
 2017-08-14 19:24:27 +02:00
Morris Jobke
ba8d26a150 Merge pull request #6090 from nextcloud/federationscope-title-bold 
Bold federation scope title in dropdown menu, as intended
 2017-08-14 11:47:47 +02:00
Morris Jobke
3d1f6a041d Fix federation scope dropdown 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-14 11:16:24 +02:00
Nextcloud bot
d1f3e1de96
[tx-robot] updated from transifex 2017-08-14 00:08:21 +00:00
Nextcloud bot
ded780a45a
[tx-robot] updated from transifex 2017-08-13 00:08:14 +00:00
Jan-Christoph Borchardt
04d6dfa67c Bold federation scope title in dropdown menu, as intended 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-08-12 15:48:15 +02:00
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
Robin Appelman
e8f5c21db9
Fix trait usage 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-06-23 12:37:42 +02:00
Arthur Schiwon
f873182965
remove obsolete files 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:37:41 +02:00
Arthur Schiwon
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
Arthur Schiwon
d56e86cfde
sync clients have their own place 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:36:38 +02:00
Arthur Schiwon
8c076e0bda
take over app passwords 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:36:38 +02:00
Arthur Schiwon
489ac4391b
convert Sessions section 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:36:38 +02:00
Arthur Schiwon
8bd887b2c6
add storage info, fix URL generation 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:36:38 +02:00
Arthur Schiwon
045f652ef2
completing PersonalInfo 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:36:37 +02:00
Arthur Schiwon
039ee7e3aa
brief, incomplete personal info settings implementation 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:36:37 +02:00
Arthur Schiwon
560ab2e911
one settings link, common template, styling 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:36:37 +02:00
Arthur Schiwon
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
blizzz
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
Nextcloud bot
c935f1f9cc
[tx-robot] updated from transifex 2017-06-23 00:09:12 +00:00
Joas Schilling
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
Joas Schilling
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
Nextcloud bot
146c699eb4
[tx-robot] updated from transifex 2017-06-21 00:08:15 +00:00
Joas Schilling
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
Joas Schilling
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