Commit graph

36788 commits

Author SHA1 Message Date
Morris Jobke
31a0821863
fix indentation
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-19 13:06:50 -06:00
Arthur Schiwon
22528f492f
also, let ldap integration tests run
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-19 17:12:00 +01:00
Arthur Schiwon
1f7b08bd19
LDAP OCS Api for show config
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-19 15:19:20 +01:00
Arthur Schiwon
f2c9d04eac
test against OCS v2 instead
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-19 12:48:50 +01:00
Arthur Schiwon
01d469dfea
add LDAP OCS Api for modifying a configuration
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-19 11:09:04 +01:00
Arthur Schiwon
18a75bec0d
fix and extend behat tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-19 10:04:15 +01:00
Arthur Schiwon
a515de54e7
LDAP OCS Api for delete config
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-18 23:17:58 +01:00
Arthur Schiwon
689df9a843
LDAP OCS Api for create config
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-18 21:13:23 +01:00
Christoph Wurst
012708e1ba Merge pull request #3023 from nextcloud/issue-2915-filter-out-sensitive-appconfigs
Filter out sensitive appconfig values
2017-01-17 11:01:42 +01:00
Nextcloud bot
b1a82969e6
[tx-robot] updated from transifex 2017-01-17 01:07:54 +00:00
Morris Jobke
250b7119b7 Merge pull request #3096 from nextcloud/update-theme-urls
Prevent Example-Theme from using invalid URLs
2017-01-16 11:42:08 -06:00
Marius Blüm
5e2995923d
Prevent Example-Theme from using invalid URLs
Signed-off-by: Marius Blüm <marius@lineone.io>
2017-01-16 17:52:28 +01:00
Joas Schilling
182f570b04 Merge pull request #3070 from dnel/Clarify-English-setting
Clarify that English refers to US English
2017-01-16 15:17:09 +01:00
Björn Schießle
6c7a7e0c1a Merge pull request #3033 from nextcloud/share-by-mail-use-display-name
generate correct path for owner and use the display name instead of t…
2017-01-16 12:29:16 +01:00
Nextcloud bot
203436b16b
[tx-robot] updated from transifex 2017-01-16 01:15:50 +00:00
Joas Schilling
c371e2f532 Merge pull request #3062 from nextcloud/user-settings-tooltip
use tooltip in user list
2017-01-13 16:53:18 +01:00
John Molakvoæ
8d8aff1bce Merge pull request #3024 from nextcloud/apps-scss-optimisation
Apps scss optimisation
2017-01-13 16:31:16 +01:00
John Molakvoæ
127024d89d Merge pull request #3048 from nextcloud/share-scss-optimisation
Share scss optimisation
2017-01-13 16:03:17 +01:00
John Molakvoæ (skjnldsv)
ce9c833c5b
App navigation utils button fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-13 15:31:42 +01:00
David Nelson
deb05a9f9d Update personal.php 2017-01-13 14:01:46 +00:00
Joas Schilling
0f792fedef Merge pull request #3060 from nextcloud/cleanup-js-tests
Cleanup js tests
2017-01-13 14:47:06 +01:00
Joas Schilling
91beb178a7 Merge pull request #3051 from nextcloud/issue-2831-change-row-format-before-collation
Change the row-format before changing the collation
2017-01-13 14:43:06 +01:00
Christoph Wurst
c70b3f0e46 use tooltip in user list
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-13 14:01:15 +01:00
Christoph Wurst
dd88e70dff fix image warnings
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-13 11:49:37 +01:00
Christoph Wurst
c82befbc00 allow/fix loading of fonts
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-13 11:46:06 +01:00
Christoph Wurst
da28a1612e expect warning to be shown
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-13 11:33:12 +01:00
Morris Jobke
622101f2dd Merge pull request #2918 from nextcloud/encryption-recovery-improvements
create new encryption keys on password reset and backup the old one
2017-01-13 11:28:43 +01:00
Christoph Wurst
9d56d5e94d add spies for l10n warnings
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-13 11:20:19 +01:00
Joas Schilling
77b5d7bc86
Change the row-format before changing the collation
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-12 16:54:29 +01:00
John Molakvoæ (skjnldsv)
bab09dc5d4
Share scss optimisation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-12 15:02:14 +01:00
Bjoern Schiessle
27357569b6
generate correct path for owner and use the display name instead of the user id
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-12 12:44:41 +01:00
Joas Schilling
5dc6899d1a
Fix tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-12 10:49:22 +01:00
Morris Jobke
00c3f807db Merge pull request #3035 from nextcloud/fix-federationScopeMenu-menu
Fit federationScopeMenu to guidelines
2017-01-12 10:09:30 +01:00
Nextcloud bot
09a46b7bd6
[tx-robot] updated from transifex 2017-01-12 01:07:43 +00:00
John Molakvoæ
a3e31116b1
Update federationscopemenu.js
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 21:20:01 +01:00
John Molakvoæ (skjnldsv)
67c4f3d07c
App-navigation action layout fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 21:01:54 +01:00
John Molakvoæ
fab82e9780 Merge pull request #3029 from nextcloud/systemtags-scss-optimisation
Systemtags scss optimisation
2017-01-11 18:41:14 +01:00
John Molakvoæ (skjnldsv)
dda4b3b272
Fix padding if empty button
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 18:37:59 +01:00
John Molakvoæ
3463c134a9 Merge pull request #3027 from nextcloud/multiselect-scss-optimisation
Multiselect scss optimisation
2017-01-11 18:24:15 +01:00
Morris Jobke
b6c00a3f51 Merge pull request #3026 from nextcloud/icons-scss-optimisation
Icons scss optimisation
2017-01-11 16:52:27 +01:00
Roeland Jago Douma
96d2f2f124 Merge pull request #3028 from nextcloud/tooltip-scss-optimisation
Tooltip scss optimisation
2017-01-11 16:38:18 +01:00
Nextcloud bot
c35ea15916
[tx-robot] updated from transifex 2017-01-11 15:20:22 +00:00
John Molakvoæ (skjnldsv)
dfee6ffaca
Systemtags scss optimisation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:38:35 +01:00
John Molakvoæ (skjnldsv)
2899f34c4c
Tooltip scss optimisation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:33:11 +01:00
John Molakvoæ (skjnldsv)
8317a71fee
Multiselect scss optimisation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:22:19 +01:00
John Molakvoæ (skjnldsv)
2a2d4390c6
Comments and delete icon
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:16:05 +01:00
John Molakvoæ (skjnldsv)
27a1dadea4
Loader and animation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:12:39 +01:00
John Molakvoæ (skjnldsv)
c87d48700c
Second optimisation and readability
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:05:42 +01:00
John Molakvoæ (skjnldsv)
735423e399
Copyright
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:05:42 +01:00
John Molakvoæ (skjnldsv)
3e36899778
Comments and cleanup
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:05:42 +01:00