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

7014 commits

Author SHA1 Message Date
Roeland Jago Douma
7cece61ff6
Extend DI tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-21 08:52:20 +01:00
Roeland Jago Douma
246e9ce547
More elegant handling of recursion 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-21 08:52:20 +01:00
Roeland Jago Douma
df14684817
PoC of moving the interface classes to the servercontainer 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-21 08:52:20 +01:00
Roeland Jago Douma
886202123c
Update query method for DIContainer 
To align with https://github.com/nextcloud/server/issues/2043#issuecomment-287348294
This would mean that AppContainers only hold the AppSpecific services

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-21 08:52:17 +01:00
Lukas Reschke
21cf1b22e9 Merge pull request #3530 from nextcloud/scss-variables 
Implement scss variables
 2017-03-20 19:49:53 +01:00
Christoph Wurst
03a92eaf74 Merge pull request #3957 from nextcloud/downstream-27307 
Follow up to #3949 (app exists on enable)
 2017-03-20 18:10:05 +01:00
Julius Härtl
29ec58f1b5
Add tests for SCSSCacher 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-03-20 14:12:35 +01:00
Lukas Reschke
450a899f01 Merge pull request #3945 from nextcloud/downstream-27298 
Adding file, line, class and function to the query logger (#27298)
 2017-03-20 13:16:10 +01:00
Julius Haertl
4fbf9a4feb
Add tests for SCSSCacher 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-03-20 12:49:08 +01:00
Julius Haertl
2bd06e0d37
Add variables.scss and import it for each scss file 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:05 +01:00
Joas Schilling
85a5c24934 Merge pull request #3939 from nextcloud/downstream-27159 
Fix malformed logging in exception
 2017-03-20 12:46:48 +01:00
Joas Schilling
257fbd85eb Merge pull request #3929 from nextcloud/downstream-27068 
cache loadUser if not exists
 2017-03-20 12:44:54 +01:00
Joas Schilling
35f6b8716e Merge pull request #3884 from nextcloud/downstream-26956 
Skip null groups in group manager
 2017-03-20 12:27:38 +01:00
Lukas Reschke
a3739906f6 Merge pull request #3924 from nextcloud/preview_fixes 
Do not generate the max preview twice
 2017-03-20 11:45:51 +01:00
Lukas Reschke
ac1aff7d92 Merge pull request #3950 from nextcloud/downstream-27149 
Forbid to upload part files via web UI
 2017-03-20 11:44:57 +01:00
Lukas Reschke
ab9e3525cc
Move error message to log entry 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-20 11:06:08 +01:00
Joas Schilling
6d30b35ed7
Some more code fixes 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-20 10:45:27 +01:00
Joas Schilling
591e75df5c
Don't use a generic exception 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-20 10:33:16 +01:00
Morris Jobke
c969d8005e Merge pull request #3949 from nextcloud/downstream-27307 
Check if app exists before enabling
 2017-03-20 03:21:02 -06:00
Lukas Reschke
373bfea427 Merge pull request #3940 from nextcloud/downstream-27048 
Add postLogout hook to finish sessions from external session managers…
 2017-03-20 10:15:34 +01:00
Lukas Reschke
20c80cba6f
Add exception to PHPDoc 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-20 10:13:57 +01:00
Morris Jobke
20534e0d1e Merge pull request #3943 from nextcloud/downstream-27318 
Output maintenance mode message on STDERR
 2017-03-20 02:42:31 -06:00
Vincent Petry
aacfef463c
Add tests for database user backend caching 
Add comment, closeCursor in user DB query

Invalidate user in cache after successful creation

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-20 02:03:03 -06:00
Jörn Friedrich Dreyer
592c04a9db
cache loadUser if not exists 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-20 02:01:41 -06:00
Morris Jobke
85d7e600c1 Merge pull request #3941 from nextcloud/downstream-27254 
HTTP 1.1 used when giving 403 and 404 errors while attempting to down…
 2017-03-20 01:53:05 -06:00
Roeland Jago Douma
81647a58db Merge pull request #3931 from nextcloud/downstream-27295 
Don't store empty groupids
 2017-03-20 08:48:09 +01:00
Morris Jobke
55df840bd9 Merge pull request #3935 from nextcloud/downstream-27293 
log where a resource was not found
 2017-03-20 01:31:20 -06:00
Felix Heidecke
11f838f9e4
Add ignore_files to config, 
test files against ignore_files list on upload

fix typo and indentation

Move blacklist declaration to lib/public/Files/FileInfo.php,

Rename *ignored to *blacklisted

Mocked blacklist_files for testing

Mocked blacklist_files for testing

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-20 01:17:12 -06:00
noveens
5481a9b84a
checking if app exists in the FileStream now 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-20 00:38:29 -06:00
Thomas Müller
45567572c8
Adding file, line, class and function to the query logger (#27298) 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-19 23:39:51 -06:00
Morris Jobke
590e98a659
ownC -> Nextc 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-19 23:20:24 -06:00
noveens
8948f66d0e
maintenance warning printed on STDERR rather than STDOUT 
redundant check removed

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-19 23:19:54 -06:00
noveens
8c27437ac0
HTTP 1.1 used when giving 403 and 404 errors while attempting to download non-existent file 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-19 23:14:26 -06:00
Felix Rupp
e7dc1f4326
Add postLogout hook to finish sessions from external session managers (#27048) 
* Add postLogout hook to finish sessions from external session managers like CAS

* Add postLogout hook to finish sessions from external session managers like CAS

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-19 23:00:12 -06:00
kdslkdsaldsal
fc57d4b96c
Fix malformed logging in exception 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-19 22:56:35 -06:00
Martin
53b8330e6d
Defining App "cron" for "Invalidating tokens older than" message #27167 (#27201) 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-19 22:51:47 -06:00
Jörn Friedrich Dreyer
6b71dd11b7
log where a resource was not found 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-19 22:21:19 -06:00
Jörn Friedrich Dreyer
4e1aca4e3c
don't store empty groupids 
gives an exception on oracle and shouldn't be added in the first place

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-19 22:01:37 -06:00
Morris Jobke
edd55b0ea9
Use SystemConfig instead of AllConfig for DB stuff 
* preparation for followup PRs to clean up the DB bootstrapping

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-19 15:53:49 -06:00
Morris Jobke
c02527e414 Merge pull request #3927 from nextcloud/minor-fixes 
Namespace and array syntax fixes
 2017-03-19 15:49:38 -06:00
Morris Jobke
d99ce3971b
Namespace and array syntax fixes 
* minor fixes in preparation of a bigger DB and config PR

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-19 14:52:54 -06:00
Roeland Jago Douma
ef789f8480 Merge pull request #3906 from nextcloud/shares-circles-2 
Support Circles
 2017-03-19 20:45:55 +01:00
Roeland Jago Douma
0ad4b89d41
Some code cleanup 
As suggested by the inspector

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-19 20:30:46 +01:00
Roeland Jago Douma
4cd13e7668
Don't generate max preview twice 
If you request a preview of X by Y. And after calculating X and Y are
equal to maxWidth and maxHeight then there is no reason to create a
preview of that size.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-19 20:23:23 +01:00
Lukas Reschke
3adee0f18b Merge pull request #3898 from nextcloud/issue-3627-always-suggest-cli-url 
Always suggest the overwrite.cli.url
 2017-03-18 00:01:17 +01:00
Maxence Lange
69694012ab shares-circles 
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
 2017-03-17 18:48:33 -01:00
Joas Schilling
26eda9dd58 Merge pull request #3892 from nextcloud/downstream-27101 
Redirect unlink to rmdir
 2017-03-17 13:56:36 +01:00
Joas Schilling
75b81c3e01
Always suggest the overwrite.cli.url 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-17 13:40:58 +01:00
blizzz
a5c8016c8b Merge pull request #3883 from nextcloud/downstream-26968 
Ignore exception when deleting keys of deleted user
 2017-03-17 11:33:50 +01:00
Joas Schilling
c65848effe Merge pull request #3878 from nextcloud/downstream-26303 
Fixed failing test which was ignoring a required (not null) column
 2017-03-17 11:10:21 +01:00