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

39777 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
1ac6eae7d5 Merge pull request #5739 from nextcloud/comradekingu-patch-4 
Spelling: Bigversal and LDAP
 2017-07-18 09:09:46 +02:00
Morris Jobke
5c900e535b Merge pull request #5745 from paulijar/master 
Fix emitting of legacy hook post_unshare
 2017-07-18 09:07:38 +02:00
Roeland Jago Douma
ac5d238ffe Merge pull request #5758 from nextcloud/comradekingu-patch-7 
Spelling: ": Bigversal"
 2017-07-18 09:06:34 +02:00
Morris Jobke
58f72309cc Merge pull request #5736 from smueller18/patch-2 
do not show hyphen in og:title if slogan does not exist
 2017-07-18 09:04:47 +02:00
Roeland Jago Douma
4b1f258198 Merge pull request #5735 from nextcloud/comradekingu-patch-1 
Spelling: Shortening and binding
 2017-07-18 08:52:09 +02:00
Morris Jobke
99555faffd Merge pull request #5737 from nextcloud/comradekingu-patch-2 
Spelling: command-line, Consider narrowing
 2017-07-18 08:49:48 +02:00
Morris Jobke
7642492cfe Merge pull request #5741 from nextcloud/comradekingu-patch-6 
Spelling: sent, an invitation, - successful
 2017-07-18 08:49:06 +02:00
Morris Jobke
79cf7d610f Merge pull request #5740 from nextcloud/comradekingu-patch-5 
Spelling: log out, : Bigversal
 2017-07-18 08:48:08 +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
Roeland Jago Douma
1956ea0e13 Merge pull request #5743 from nextcloud/comradekingu-patch-7 
Spelling: - your
 2017-07-17 14:42:13 +02:00
Nextcloud bot
125767265d
[tx-robot] updated from transifex 2017-07-17 00:08:02 +00:00
Pauli Järvinen
8dce97a3e1 Fix emitting of legacy hook post_unshare 
- When a file was unshared, the legacy hook pre_unshare fired twice and the hook post_unshare did not fire at all. This was obviously a copy-paste error.

Signed-off-by: Pauli Järvinen <pauli.jarvinen@gmail.com>
 2017-07-16 13:13:15 +03:00
Allan Nordhøy
1d24c82e38 - your 
This avoids it being «"access to your "the cloud"» or similar. Italicizing %s might be a middleground here.
 2017-07-15 11:39:50 +02:00
Nextcloud bot
a23cdd04bb
[tx-robot] updated from transifex 2017-07-15 00:08:54 +00:00
Morris Jobke
aa0a1c4174 Merge pull request #5724 from nextcloud/fix-drone 
Fix drone
 2017-07-14 23:33:13 +02:00
Morris Jobke
649c47b199 Temporarily disable acceptance and object storage tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-14 21:48:52 +02:00
Allan Nordhøy
de6b7668c1 sent, an invitation, - successful 2017-07-14 17:28:57 +02:00
Allan Nordhøy
6ab8b90e94 log out, : Bigversal 2017-07-14 17:02:48 +02:00
Allan Nordhøy
ddc804aa32 : Bigversal and LDAP 2017-07-14 15:46:05 +02:00
Allan Nordhøy
4b8c1eaa91 command-line, Consider narrowing 2017-07-14 15:32:47 +02:00
Stephan Müller
7cf3dc4e29 do not show hyphen in og:title if slogan does not exist 2017-07-14 15:26:44 +02:00
Allan Nordhøy
66cbf90853 Spelling: Shortening and binding 2017-07-14 15:24:55 +02:00
Lukas Reschke
a79447c6fd Merge pull request #5699 from nextcloud/bruteforce_capability 
Add bruteforce capabilities
 2017-07-14 15:20:31 +02:00
Morris Jobke
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
Björn Schießle
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
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
Nextcloud bot
3865c77279
[tx-robot] updated from transifex 2017-07-14 00:08:37 +00:00
Morris Jobke
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
Morris Jobke
01466ab840 Merge pull request #5715 from nextcloud/master-5655 
Fixed repair step
 2017-07-13 19:30:05 +02:00
Robin Appelman
350e036c56 chunk getting invalid paths and reuse queries 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-13 16:37:38 +02:00
Robin Appelman
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
Robin Appelman
03f27b4c2c
Fix scan permissions with nested permissions masks 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-13 14:29:04 +02:00
Joas Schilling
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
Roeland Jago Douma
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
Roeland Jago Douma
23129aa555
Update autoloader 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-13 11:23:10 +02:00
Roeland Jago Douma
6a1f2ac076
Add bruteforce capabilities 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-13 11:23:08 +02:00
Morris Jobke
598835b06f Merge pull request #5703 from nextcloud/autoloader_fix 
Fix autoloader
 2017-07-13 10:40:16 +02:00
Roeland Jago Douma
31d5f946af
Fix autoloader 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-13 09:10:59 +02:00
Nextcloud bot
261513b04a
[tx-robot] updated from transifex 2017-07-13 00:08:31 +00:00
Roeland Jago Douma
6461d083e2 Merge pull request #4984 from nextcloud/tmpcertfile 
Create a temp certfile
 2017-07-12 20:20:46 +02:00
Roeland Jago Douma
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
Joas Schilling
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
Lukas Reschke
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
Roeland Jago Douma
86a496d94a Merge pull request #5567 from nextcloud/public-capabilities 
Public capabilities API
 2017-07-12 13:04:54 +02:00
Roeland Jago Douma
08d3cb9107 Merge pull request #5685 from nextcloud/jail-propagator 
Fix propagating changes within jail wrapper
 2017-07-12 12:14:51 +02:00
Morris Jobke
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
Julius Härtl
ce5ad7e7f4
Prefer custom theme over theming app 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-07-12 11:42:15 +02:00
Nextcloud bot
13295c2d1d
[tx-robot] updated from transifex 2017-07-12 00:08:43 +00:00
Lukas Reschke
1b12e7ad7b Merge pull request #5657 from nextcloud/select-error-text 
[Small] warning is now selecteable
 2017-07-11 21:45:57 +02:00