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

45894 Commits

Author SHA1 Message Date
Roeland Jago Douma bddf937e14
Add 7.3 CI to drone 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-12 12:21:06 +02:00
Morris Jobke 549d53cd93
Merge pull request #11784 from nextcloud/release/14.0.3 
14.0.3
 2018-10-12 08:46:59 +02:00
Roeland Jago Douma af1ccb9b46
14.0.3 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-11 20:41:34 +02:00
Roeland Jago Douma db03468911
Merge pull request #11770 from nextcloud/backport/11764/stable14 
[14] Normalize getUnjailedPath
 2018-10-11 20:19:10 +02:00
Bernd Stellwag 86b2e7d2e7 Remove duplicate call to decodeURIComponent 
Signed-off-by: Bernd Stellwag <burned@zerties.org>

(cherry picked from commit 0f030d885b)
Signed-off-by: Bernd Stellwag <burned@zerties.org>
 2018-10-11 18:40:31 +02:00
Daniel Kesselberg 4f983b7565
Backport https://github.com/nextcloud/server/pull/11446 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-10-11 15:14:33 +02:00
Roeland Jago Douma 18c35e6060
Normalize getUnjailedPath 
Fixes #11637

If we do not normalize the unjailed path we might end up with a path
like files/user/folder/. which can break on objectstores

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-11 14:49:32 +02:00
Morris Jobke feb8a795ea
Merge pull request #11761 from nextcloud/stable14-11756-ignore-session-lifetime-if-it-can-not-be-converted-to-a-number 
[stable14] Ignore "session_lifetime" if it can not be converted to a number
 2018-10-11 13:25:20 +02:00
Daniel Calviño Sánchez a246cc10fd Ignore "session_lifetime" if it can not be converted to a number 
When "session_lifetime" can not be converted to a number the interval
becomes a NaN due to dividing it by 2. This NaN was "dragged" over all
the other mathematical operations and caused the csrftoken to be got
again and again due to an infinite loop with no pauses in "setInterval".
Now, the interval is set to the default value instead if the
"session_lifetime" can not be converted to a number.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-10-11 11:56:12 +02:00
Roeland Jago Douma 55e737afb1
Merge pull request #11662 from nextcloud/fix/11468/app-menu-scrollbar-14 
[14] Fixes the apps menu scrollbar
 2018-10-11 11:38:49 +02:00
Morris Jobke 51813f76d9
Merge pull request #11751 from nextcloud/release/14.0.2 
14.0.2
 2018-10-11 09:43:02 +02:00
Roeland Jago Douma 53fb47802c
14.0.2 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-11 08:56:36 +02:00
Morris Jobke 5bf4bc7ed1
Merge pull request #11738 from nextcloud/backport/11733/fix-setupcheck-14 
[stable14] Fix a misleading setup check for .well-known/caldav & carddav
 2018-10-11 08:49:57 +02:00
Bjoern Schiessle 84e39b522c
some small fixes and improvements 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-10-10 16:08:49 +02:00
Morris Jobke 5f0887c1d5
Fix a misleading setup check for .well-known/caldav & carddav 
The problem is that the version without the slash is the correct one.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-10-10 15:54:12 +02:00
Nextcloud bot cef454c280
[tx-robot] updated from transifex 2018-10-10 00:13:24 +00:00
Bjoern Schiessle 7e608df598
adjust tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-10-09 18:32:09 +02:00
Morris Jobke 0fe69b1c13
Merge pull request #11715 from nextcloud/version/noid/14.0.2RC2 
14.0.2 RC 2
 2018-10-09 17:59:43 +02:00
Bjoern Schiessle 52c52f555d
always query the lookup server in a global scale setup and have a nicer label 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-10-09 17:48:15 +02:00
Morris Jobke 09c270ab14
14.0.2 RC 2 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-10-09 15:34:20 +02:00
Morris Jobke 121edc9cfd
Merge pull request #11720 from nextcloud/revert-11684-backport/10782/stable14 
Revert "[stable14] in 14 the click action gets lost in the Backbone view."
 2018-10-09 15:32:16 +02:00
Morris Jobke 6957e1f39c
Revert "[stable14] in 14 the click action gets lost in the Backbone view." 2018-10-09 15:32:07 +02:00
Morris Jobke 022a45faed
Merge pull request #11684 from nextcloud/backport/10782/stable14 
[stable14] in 14 the click action gets lost in the Backbone view.
 2018-10-09 14:30:57 +02:00
Morris Jobke 04460e2743
Merge pull request #11703 from nextcloud/backport/11677/stable14 
[14] Allow the creationg of previews of files stored in appdata
 2018-10-09 13:29:17 +02:00
Morris Jobke 2f14387420
Merge pull request #11706 from nextcloud/backport/11705/update-crl 
[stable14] Update CRL due to changed cert for linkshareex
 2018-10-09 13:18:42 +02:00
Morris Jobke 571f98ef86
Update CRL due to changed cert for linkshareex 
See https://github.com/nextcloud/app-certificate-requests/pull/193

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-10-09 11:56:49 +02:00
Roeland Jago Douma f7e9533d1e
Allow the creationg of previews of files stored in appdata 
To allow us to create previews of files stored in appdata we need to
construct the view differently.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-09 11:49:02 +02:00
Nextcloud bot ecf14adf76
[tx-robot] updated from transifex 2018-10-09 00:12:37 +00:00
Arthur Schiwon 2419ff4909
in 14 the click action gets lost in the Backbone view. 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-10-08 17:46:09 +02:00
Nextcloud bot cd5da4700f
[tx-robot] updated from transifex 2018-10-08 00:13:04 +00:00
Michael Weimann 14af19af58
Fixes the apps menu scrollbar 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-10-07 13:59:40 +02:00
Nextcloud bot acffe7a74e
[tx-robot] updated from transifex 2018-10-07 00:12:30 +00:00
Nextcloud bot 32aa38ebdb
[tx-robot] updated from transifex 2018-10-06 00:12:23 +00:00
Nextcloud bot 723dbe242a
[tx-robot] updated from transifex 2018-10-05 00:13:09 +00:00
Morris Jobke 1462508b80
Merge pull request #11588 from nextcloud/version/noid/14.0.1RC1 
14.0.2 RC 1
 2018-10-04 17:53:32 +02:00
Morris Jobke 84f7d23116
14.0.2 RC 1 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-10-04 16:35:05 +02:00
Morris Jobke 0afef27860
Merge pull request #11610 from nextcloud/bugfix/noid/stable14-fix-call-to-logger 
[14] Fix call to logger
 2018-10-04 15:45:04 +02:00
Daniel Kesselberg 718e34a075
Append error from exception for message 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-10-04 11:34:27 +02:00
Roeland Jago Douma ded541408c
Merge pull request #11608 from nextcloud/users-table-header-fix-14 
[stable14] Fix header border on users list
 2018-10-04 10:21:48 +02:00
John Molakvoæ (skjnldsv) a623f96e86
Fix header border on users list 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-10-04 09:01:23 +02:00
Nextcloud bot e87ec7d2c9
[tx-robot] updated from transifex 2018-10-04 00:12:17 +00:00
Nextcloud bot 1302b6f267
[tx-robot] updated from transifex 2018-10-03 16:58:57 +00:00
Morris Jobke 5b33cbd507
Merge pull request #11582 from nextcloud/stb14-users-table-header-fix 
[stable14] Fix sticky header on users list
 2018-10-03 14:54:37 +02:00
Morris Jobke 0ca305b1c1
Merge pull request #11575 from nextcloud/stb14-add-group-settings 
[stable14] Add new group entry on users list + fixes
 2018-10-03 14:53:48 +02:00
Roeland Jago Douma 316a3a501c
Merge pull request #11579 from nextcloud/stb14-dropdown-bottom-users-list-fix 
[stable14] Force multiselect max-height to 5.5 items
 2018-10-03 13:36:17 +02:00
Roeland Jago Douma 6734e434bc
Merge pull request #11580 from nextcloud/backport/11568/stable14 
[stable14] Just update password hash without validating
 2018-10-03 13:35:51 +02:00
Morris Jobke 7d850c35aa
Merge pull request #11577 from nextcloud/backport/11185/stable14 
[stable14] Redirect guests to login if they follow the link of a comment mention-notifications
 2018-10-03 12:58:27 +02:00
John Molakvoæ (skjnldsv) 0c4e27005a
Fixed js error 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-10-03 12:16:16 +02:00
John Molakvoæ (skjnldsv) b9d273bdac
Fix sticky header on users list 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-10-03 12:12:06 +02:00
Roeland Jago Douma 5e143f1f52
Just update password hash without validating 
Fixes #11097

If your password hash changed (becuse your are on 7.2 and we moved to
ARGON2). Then we shold not 'set a new password' but just update the
hash. As else we invoke the password policy again which might lock out
users.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-03 12:09:43 +02:00