7284458e24
Clean up HTML structure, fix labels.
...
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-08-03 12:51:27 +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
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
aa0a1c4174
Merge pull request #5724 from nextcloud/fix-drone
...
Fix drone
2017-07-14 23:33:13 +02:00
649c47b199
Temporarily disable acceptance and object storage tests
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-14 21:48:52 +02:00
a79447c6fd
Merge pull request #5699 from nextcloud/bruteforce_capability
...
Add bruteforce capabilities
2017-07-14 15:20:31 +02:00
9a34c5051f
Fix drone
...
Fix service container host name
check current folder
fix redis for integration test
Fix more hostnames
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-14 15:04:18 +02:00
f90f4db0cd
Merge pull request #5725 from nextcloud/remove-legacy-files
...
this template file is no longer needed
2017-07-14 13:30:22 +02: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
1f1504e071
Merge pull request #5708 from nextcloud/nested-permissions-mask
...
Fix scan permissions with nested permissions masks
2017-07-13 23:27:01 +02:00
01466ab840
Merge pull request #5715 from nextcloud/master-5655
...
Fixed repair step
2017-07-13 19:30:05 +02:00
350e036c56
chunk getting invalid paths and reuse queries
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-13 16:37:38 +02:00
4a727a578c
use a generator instead of fetching all rows at once
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-13 16:37:34 +02:00
03f27b4c2c
Fix scan permissions with nested permissions masks
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-13 14:29:04 +02:00
e335121d5e
Merge pull request #5070 from nextcloud/theming-vs-themes
...
Prefer custom theme over the theming app
2017-07-13 13:41:31 +02:00
f71457782b
Merge pull request #5695 from nextcloud/dont-error-when-the-table-doesnt-exist
...
Don't throw an error when the table doesn't exist
2017-07-13 13:28:52 +02:00
23129aa555
Update autoloader
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-13 11:23:10 +02:00
6a1f2ac076
Add bruteforce capabilities
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-13 11:23:08 +02:00
598835b06f
Merge pull request #5703 from nextcloud/autoloader_fix
...
Fix autoloader
2017-07-13 10:40:16 +02:00
31d5f946af
Fix autoloader
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-13 09:10:59 +02:00
261513b04a
[tx-robot] updated from transifex
2017-07-13 00:08:31 +00:00
6461d083e2
Merge pull request #4984 from nextcloud/tmpcertfile
...
Create a temp certfile
2017-07-12 20:20:46 +02:00
04f2090698
Write cert bundle to tmp file first
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-12 19:24:20 +02:00
c6b7204fcb
Don't throw an error when the table doesn't exist
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-12 15:35:24 +02:00
35111144d6
Merge pull request #5690 from nextcloud/files-checker
...
Add test to check if new files are added to the root of the repository
2017-07-12 14:18:34 +02:00
86a496d94a
Merge pull request #5567 from nextcloud/public-capabilities
...
Public capabilities API
2017-07-12 13:04:54 +02:00
08d3cb9107
Merge pull request #5685 from nextcloud/jail-propagator
...
Fix propagating changes within jail wrapper
2017-07-12 12:14:51 +02:00
844e7b03b4
Add test to check if new files are added to the root of the repository
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-12 11:52:42 +02:00
ce5ad7e7f4
Prefer custom theme over theming app
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-07-12 11:42:15 +02:00
13295c2d1d
[tx-robot] updated from transifex
2017-07-12 00:08:43 +00:00
1b12e7ad7b
Merge pull request #5657 from nextcloud/select-error-text
...
[Small] warning is now selecteable
2017-07-11 21:45:57 +02:00
9e2d1caba2
Merge pull request #5681 from nextcloud/upstream-fix-circles
...
upstream fix circles
2017-07-11 18:03:06 +02:00
dfe662ad42
Fix propagating changes within jail wrapper
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-11 17:55:04 +02:00
4153e1de79
Merge pull request #5672 from nextcloud/upload-hidden-filelist
...
properly block file upload to non-active filelist
2017-07-11 15:15:49 +02:00
e1d6ca3c53
fix test
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-11 14:03:11 +02:00
6e7be6acfd
upstream
...
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-07-11 13:21:24 +02: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
464e635c28
Merge pull request #5666 from nextcloud/comradekingu-patch-2
...
Spelling: No "we" for recommendations.
2017-07-10 17:34:36 +02:00
22693aec47
Merge pull request #5669 from nextcloud/fix-remote-share-activity-emails
...
Fix remote share activity emails
2017-07-10 16:16:54 +02:00
a15591347a
Merge pull request #5671 from GitHubUser4234/ldap_password_renew_nc12fix
...
Rectify variable in RenewpasswordController
2017-07-10 15:04:21 +02:00
12c9b1efb0
properly block file upload to non-active filelist
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-10 14:32:10 +02:00
0ebec6f9a4
Rectify variable $uid->$user
...
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-07-10 18:46:39 +08:00
33cb45d4a3
Fix owner cloud id in unshare activity
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-10 12:20:56 +02:00
Marin Treselj
Andreas Jacobsen
Andreas Jacobsen
Nextcloud bot
Morris Jobke
Lukas Reschke
Björn Schießle
Robin Appelman
Joas Schilling
Roeland Jago Douma
Roeland Jago Douma
Julius Härtl
Maxence Lange
Roger Szabo