mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
40,182 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

40182 Commits

Author SHA1 Message Date
Morris Jobke 28d77efe80
Merge pull request #7688 from nextcloud/stable12-fix-scss-webroot-and-url-rewrite 
[Stable12] fix scss webroot and url rewrite
 2018-01-05 17:29:08 +01:00
John Molakvoæ (skjnldsv) b95d18b85e
Revert rebaseurl function edit 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-01-05 08:35:38 +01:00
John Molakvoæ (skjnldsv) 7a282dee89
Rollback caching fix 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-01-05 08:34:32 +01:00
Julius Härtl 7bc63f6135
Fix faulty path in theming scss generation 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-05 08:17:39 +01:00
Nextcloud bot a3933b99fe
[tx-robot] updated from transifex 2018-01-05 01:11:32 +00:00
John Molakvoæ (skjnldsv) 1f2437e2c5
Fixup! Proberly detect variable changes 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-01-04 19:11:41 +01:00
John Molakvoæ (skjnldsv) cf53560218
Proberly detect variable changes 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-01-04 19:10:27 +01:00
John Molakvoæ (skjnldsv) fa95733b0d
Fixed url rebase with theming 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-01-04 13:24:21 +01:00
Nextcloud bot 233fd16049
[tx-robot] updated from transifex 2018-01-04 09:48:45 +00:00
John Molakvoæ (skjnldsv) 51cc76b80d
Fixed tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-01-04 08:35:38 +01:00
John Molakvoæ (skjnldsv) 1ae126a781
Fixed tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-01-03 22:05:03 +01:00
John Molakvoæ (skjnldsv) 9fa49c7f24
Correctly remove temp test directory tree 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-01-03 22:05:03 +01:00
John Molakvoæ (skjnldsv) 87b1839cd1
Added tests for various installations types 
- With root installation
 - Core css
 - App inside server root
 - Secondary apps directory outside server root
- With an installation in a sub directory
 - Core css
 - App inside server root
 - Secondary apps directory outside server root

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-01-03 22:05:02 +01:00
John Molakvoæ (skjnldsv) a46d45a652
Fixup! getWebdir return 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-01-03 22:05:02 +01:00
John Molakvoæ (skjnldsv) 89b6bc9424
Use OC_Util function for app web path 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-01-03 22:05:02 +01:00
John Molakvoæ (skjnldsv) 5008eb8f85
getWebDir function 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-01-03 22:05:02 +01:00
John Molakvoæ (skjnldsv) 00412d1c8c
Fixed webroot for scss files 
Fixed tests

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-01-03 22:04:59 +01:00
John Molakvoæ (skjnldsv) f13b3b6651
Fixed scss url rewriting 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-01-03 22:04:08 +01:00
Roeland Jago Douma f9490505ad
Merge pull request #7672 from nextcloud/backport/6977/log-censor 
[stable12] Added additional methods for removal of sensitive info
 2018-01-03 12:54:56 +01:00
Joas Schilling 903d7fcd6a
Unit tests for #6977 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-01-03 10:46:30 +01:00
Johannes Schlichenmaier a7e67a6ce2
Added additional methods for removal of sensitive info 
Signed-off-by: Johannes Schlichenmaier <johannes@schlichenmaier.info>
 2018-01-03 10:46:04 +01:00
Morris Jobke 9ed0f50c25
Merge pull request #7567 from nextcloud/stable-12_fix7428 
Respect sharing options when searching for Sharees
 2017-12-20 14:18:33 +01:00
Roeland Jago Douma 4ed99dd54b
Merge pull request #7577 from nextcloud/7361_12 
[stable12] check userExists later, saves lookups for appData_INSTANCEID userids
 2017-12-19 15:51:32 +01:00
Arthur Schiwon e788ae0cf6
check userExists later, saves lookups for appData_INSTANCEID userids 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-12-19 14:13:37 +01:00
Roeland Jago Douma fe9f100a1b
Merge pull request #7568 from nextcloud/stable12-fix-duplicate-session-token 
[stable12] Fix duplicate session token after remembered login
 2017-12-19 13:33:35 +01:00
Christoph Wurst 85c18f5980
Fix duplicate session token after remembered login 
On a remembered login session, we create a new session token
in the database with the values of the old one. As we actually
don't need the old session token anymore, we can delete it right
away.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-12-19 09:17:06 +01:00
Tobia De Koninck 7f18a8d19f Don't show users which e-mail address match if they belong to a group we may not share with 
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
 2017-12-19 08:43:08 +01:00
Morris Jobke 6859e5a22a
Merge pull request #7558 from nextcloud/12-7427 
[stable12] Fix email buttons for white theme
 2017-12-18 21:19:51 +01:00
Morris Jobke e726d191f1
Fix email buttons for white theme 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-12-18 17:03:01 +01:00
Morris Jobke 3a99ef5286
Merge pull request #7464 from nextcloud/cached-mount-info-filepath-12 
[12] Allow getting the filepath when getting cached mounts by fileid
 2017-12-13 13:28:25 +01:00
Morris Jobke 93797b2e5d
Merge pull request #7468 from nextcloud/update-user-agent-regex-stable12 
allow 'Nextcloud' in the user agent string of Android
 2017-12-12 15:44:55 +01:00
Bjoern Schiessle 1a4eab744e
fix dav unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-12-12 14:38:49 +01:00
Bjoern Schiessle 003c709d25
allow 'Nextcloud' in the user agent string of Android 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-12-12 14:38:36 +01:00
Robin Appelman 3ec1bbbde8
Allow getting the filepath when getting cached mounts by fileid 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-12 14:11:40 +01:00
Morris Jobke f44d5bde56
Merge pull request #7456 from nextcloud/12_7342 
[stable12] CardDAV convertor check should not be to wide
 2017-12-12 10:04:40 +01:00
Roeland Jago Douma 4b60ada694
Merge pull request #7457 from nextcloud/stable12-7271 
[stable12] Fix loading icon position in the app menu
 2017-12-12 07:50:40 +01:00
Morris Jobke 77b58aeb16
Merge pull request #7455 from nextcloud/12_7230 
[stable12] Remove wrong entry in admin_settings that causes 500
 2017-12-11 22:45:25 +01:00
Julius Härtl c023486845
Fix loading icon position in the app menu 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-12-11 22:00:20 +01:00
Roeland Jago Douma dfed58e947
CardDAV convertor check should not be to wide 
Case: email is set to null, but the avatar is set. In the old case the
email would set $emptyValue but $noImage would still be false. This we
would set the empty string as email.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-12-11 21:14:33 +01:00
Morris Jobke d41971184b
Remove wrong entry in admin_settings that causes 500 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-12-11 21:04:56 +01:00
Morris Jobke 2bd2835526
Merge pull request #7451 from nextcloud/12-7433 
[stable12] Fix constructor spy in unit test with Sinon 4.1.3
 2017-12-11 17:25:36 +01:00
Daniel Calviño Sánchez 26cf16d67f
Fix constructor spy in unit test with Sinon 4.1.3 
When a constructor is spied using Sinon it is wrapped by a proxy
function, which calls the original constructor when invoked. When "new
Foo()" is executed a "Foo" object is created, "Foo" is invoked with the
object as "this", and the object is returned as the result of the whole
"new" expression.

Before Sinon 4.1.3 the proxy called the original constructor directly
using the "thisValue" of the spied call; "thisValue" was the object
created by the "new" operator that called the proxy. The proxy assigned
"thisValue" to "returnValue", so it was also the value returned by the
proxy and, in turn, the value returned by the whole "new" expression.

Since Sinon 4.1.3 (see pull request 1626) the proxy calls the original
constructor using "new" instead of directly. The "thisValue" created by
the outermost "new" (the one that called the proxy) is no longer used by
the original constructor; the internal "new" creates a new object, which
is the one passed to the original constructor and returned by the
internal "new" expression. This object is also the value returned by the
proxy ("returnValue") and, in turn, the value returned by the whole
outermost "new" expression.

Thus, now "returnValue" should be used instead of "thisValue" to get the
object created by the spied constructor.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-12-11 16:49:39 +01:00
Nextcloud bot e4bf23ce7b
[tx-robot] updated from transifex 2017-12-11 01:10:34 +00:00
Nextcloud bot 0ff717c600
[tx-robot] updated from transifex 2017-12-10 01:10:38 +00:00
Nextcloud bot 0c272f2121
[tx-robot] updated from transifex 2017-12-09 01:10:36 +00:00
Roeland Jago Douma ac29608db6
Merge pull request #7409 from nextcloud/swift-retry-12 
[12]add retry wrapper when reading files from swift
 2017-12-08 09:26:41 +01:00
Morris Jobke c9318ddd1b
Merge pull request #7407 from nextcloud/12_7348 
[stable12] Check if owner of share exists
 2017-12-08 09:22:07 +01:00
Morris Jobke 5dd15c4a7d
Merge pull request #7323 from nextcloud/shared-jailed-source-root-12 
[12]Use the correct root for shared jail when the source storage is also a jail
 2017-12-08 09:03:03 +01:00
Nextcloud bot 53fa7fb3c6
[tx-robot] updated from transifex 2017-12-08 01:10:26 +00:00
Nextcloud bot 8d89ec3c30
[tx-robot] updated from transifex 2017-12-07 01:10:49 +00:00