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

46123 commits

This branch
This branch
All branches
Author SHA1 Message Date
blizzz
5daa4f27e1
Merge pull request #11882 from nextcloud/feature/noid/consider-net-connection 
Do not try to contact lookup server without internet connection or URL
 2018-10-18 18:24:41 +02:00
Arthur Schiwon
8e4ae23c48
Do not try to contact lookup server without internet connection or URL 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-10-18 17:49:28 +02:00
Julius Härtl
fef361a0a0
Merge pull request #11894 from nextcloud/npm/settings 
Bump npm deps in /settings
 2018-10-18 16:26:22 +02:00
Morris Jobke
302a5d8171
Merge pull request #11785 from nextcloud/3rdparty/azure/1.2.0 
[3rdparty] Bump azure-storage-blog 1.2.0
 2018-10-18 11:49:08 +02:00
Morris Jobke
729b853a30
Merge pull request #11853 from nextcloud/csp/comments 
Move more comments to compiled handlebars
 2018-10-18 11:40:00 +02:00
Morris Jobke
4e53ea6dbd
Merge pull request #11822 from nextcloud/bugfix/noid/forbid_freebusy_but_allow_local_delivery 
allow local delivery of schedule message while prohibiting FreeBusy requests
 2018-10-18 11:35:51 +02:00
Morris Jobke
b25307d949
Merge pull request #11896 from nextcloud/fix/personal-2fa-settings-unreliable-state 
Remove unreliable 2FA state message on personal 2FA settings page
 2018-10-18 11:22:49 +02:00
blizzz
0c05ed1d3d
Merge pull request #11878 from nextcloud/no-require-same-site-cookie-on-assets 
Don't require Same Site Cookies on assets
 2018-10-18 10:24:56 +02:00
Christoph Wurst
4f75173f11
Remove unreliable 2FA state message on personal 2FA settings page 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-10-18 09:51:08 +02:00
Roeland Jago Douma
0e0db13bb9
[3rdparty] Bump azure-storage-blog 1.2.0 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-18 08:20:05 +02:00
Roeland Jago Douma
053ddbaa6f
Bump npm deps in /settings 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-17 22:20:15 +02:00
blizzz
2634ceb35b
Merge pull request #11862 from nextcloud/bugfix/ensure_cache_it_init 
Double check for failed cache with a shared storage
 2018-10-17 13:12:57 +02:00
Morris Jobke
7c8b3c1056
Merge pull request #11842 from nextcloud/fix/settings-strict-csp 
Fix settings' strict CSP
 2018-10-17 12:20:04 +02:00
Thomas Citharel
d63de5471b Don't require Same Site Cookies on assets 
Which can be used for public iframe embeeding

See https://github.com/nextcloud/calendar/issues/169

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-10-17 09:24:21 +02:00
Georg Ehrke
f5dc7b7f07
move disableFreeBusy check from User principal backend to Scheduling Outbox collection. This allows to keep local delivery of scheduling messages while prohibiting FreeBusy requests 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-10-16 20:27:33 +02:00
Morris Jobke
b88ab75c3a
Merge pull request #11870 from nextcloud/fix/noid/proper-column-name-escaping 
Properly quote column name in "createFunction" call
 2018-10-16 17:02:26 +02:00
Morris Jobke
b458ed9c82
Properly escape column name in "createFunction" call 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-10-16 15:24:02 +02:00
Morris Jobke
262ff13136
Merge pull request #11835 from nextcloud/csp/jquery_contactsmenu 
Move jquery.contactsmenu.js to compiled handlebars
 2018-10-16 12:20:57 +02:00
Roeland Jago Douma
2849f24154
Merge pull request #11839 from nextcloud/csp/files_drop 
Move files_drop to compiled handlebars
 2018-10-16 12:16:31 +02:00
Christoph Wurst
8222e9dd12
Remove Vue compiler because templates have to be precompiled anyway 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-10-16 11:49:42 +02:00
Christoph Wurst
f8579a87f5
Fix unsafe-eval used in 2FA admin settings 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-10-16 11:49:07 +02:00
Roeland Jago Douma
1bc388e507
Double check for failed cache with a shared storage 
When obtaining the SourceRootInfo we can call init. If this fails the
cache is set to a failed cache and the storage to a failed storage.
However we did not check for this. Which means that if the storage was
invalid it would fail later on.

Now we will properly error out.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-16 10:57:37 +02:00
Julius Härtl
0b4ea70995
Tests: Remove spacing from html before comparing the template 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-16 10:49:34 +02:00
Roeland Jago Douma
0a4a23f015
Move jquery.contactsmenu.js to compiled handlebars 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-16 09:51:36 +02:00
Morris Jobke
ad66b0f9ab
Merge pull request #11830 from nextcloud/bugfix/9326/make_sure_usermanager_getByEmail_only_returns_IUser 
filter null values for UserManager::getByEmail
 2018-10-16 09:14:25 +02:00
Roeland Jago Douma
6c532576ee
fixup! Move files_drop to compiled handlebars 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-16 09:02:48 +02:00
Morris Jobke
afaee648dd
Merge pull request #11358 from Zulan/fix-welcome-l10n 
Fix welcome l10n
 2018-10-16 09:01:59 +02:00
Roeland Jago Douma
bee5bbbf0e
Move files_drop to compiled handlebars 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-16 08:27:06 +02:00
Roeland Jago Douma
5aaa8a8b58
Merge pull request #11740 from nextcloud/feature/noid/account-api 
Public API to get user acocunt data
 2018-10-15 21:46:09 +02:00
Roeland Jago Douma
3797b8e7e3
Merge pull request #11834 from nextcloud/csp/federationmenu 
Compile federationscope menu handlebars template
 2018-10-15 21:23:19 +02:00
Roeland Jago Douma
353fddfbb9
Merge pull request #11849 from nextcloud/csp/fileactionsmenu 
Move fileactionsmenu to compiled handlebars
 2018-10-15 21:22:07 +02:00
Maxence Lange
f5a495bc3e
Merge pull request #10222 from nextcloud/interface-dashboard 
Public interfaces for dashboard app
 2018-10-15 20:56:19 +02:00
Maxence Lange
dfd4782dfc
include dashboard into core 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
Merge remote-tracking branch 'origin/interface-dashboard' into interface-dashboard

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
moving data object to OCP

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
update autoload files

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
+@since

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2018-10-15 19:59:27 +02:00
Roeland Jago Douma
e7443ee892
Move more comments to compiled handlebars 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-15 19:52:22 +02:00
Julius Härtl
11144aa614
Merge pull request #11848 from nextcloud/csp/workflowengine 
Move workflowengine to compiled handlebars
 2018-10-15 19:46:14 +02:00
Julius Härtl
c316eb6b97
Tests: Properly compare the file action label 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-15 19:18:20 +02:00
zulan
cf266ee004 Get l10n within NewUserMailHelper to ensure it always uses the new user's language. 
Some related tests had to be changed because they relied on internals, see also from the PHPUnit documentation:
"Exercise caution when using [the at] matcher as it can lead to brittle tests which are too closely tied to specific implementation details."

Signed-off-by: Zulan <git@zulan.net>
 2018-10-15 19:01:46 +02:00
Roeland Jago Douma
a1b7449202
Move fileactionsmenu to compiled handlebars 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-15 15:51:40 +02:00
Roeland Jago Douma
8c4c4b700f
Move workflowengine to compiled handlebars 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-15 14:55:25 +02:00
Roeland Jago Douma
6f835aff31
Merge pull request #11838 from nextcloud/bugfix/noid/fix-default-types-of-members 
Fix default types of activity event member variables
 2018-10-15 14:09:44 +02:00
Julius Härtl
b9a87a69cf
Use IAccountManager constants 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-15 13:30:31 +02:00
Julius Härtl
90cdd0a12a
Update autoloader 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-15 13:30:31 +02:00
Julius Härtl
9381e681a9
Add tests for new account api classes 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-15 13:30:31 +02:00
Julius Härtl
d05080f56a
Add \OCP\Account public API 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-15 13:30:31 +02:00
Georg Ehrke
2db26d87c4
filter null values for UserManager::getByEmail 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-10-15 13:27:58 +02:00
Björn Schießle
1ce8672276
Merge pull request #11714 from nextcloud/lookupserver-and-global-scale 
always query the lookup server in a global scale setup
 2018-10-15 12:14:04 +02:00
Joas Schilling
909745acfd
Fix default types of activity event member variables 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-10-15 11:45:17 +02:00
Morris Jobke
8177fdb0f6
Merge pull request #11765 from nextcloud/feature/mandatory-2fa-for-groups 
Mandatory 2FA for groups
 2018-10-15 10:58:05 +02:00
Roeland Jago Douma
d65438f931
Compile federationscope menu handlebars template 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-15 10:44:24 +02:00
Morris Jobke
e36d4a990d
Merge pull request #10439 from eugulixes/improve-encrypt-all-and-decrypt-all-commands 
Check if TTY is invalid in encryption:encrypt-all and encryption:decrypt-all
 2018-10-15 09:15:58 +02:00