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

42077 Commits

Author SHA1 Message Date
Julius Härtl 76c79ff18f
Only override image styles if the theming values are set 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-02 13:05:41 +01:00
Julius Härtl 73ae7b0c5f
Make sure that injected variables do not break the CSS generation 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-02 13:05:25 +01:00
Julius Härtl d8e0a6ee32
SCSS files are only cached if their size is > 0 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-02 13:05:03 +01:00
Morris Jobke b2e3e29266
Merge pull request #8142 from nextcloud/13-update-server 
[stable13] Use correct update server
 2018-02-02 12:18:29 +01:00
Nextcloud bot 6989c65acf
[tx-robot] updated from transifex 2018-02-02 01:10:28 +00:00
Nextcloud bot 501685288b
[tx-robot] updated from transifex 2018-02-01 18:28:19 +00:00
Nextcloud bot d5e56b34c4
[tx-robot] updated from transifex 2018-02-01 17:20:02 +00:00
Christoph Wurst 62f4454d99
Merge pull request #8138 from nextcloud/13-update-doc-version 
Update doc link version to 13
 2018-02-01 14:45:45 +01:00
Morris Jobke d9e229ab70
Use correct update server 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-01 14:43:53 +01:00
Morris Jobke f46573d836
Update doc link version to 13 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-01 13:53:24 +01:00
Nextcloud bot 2e6e969fbc
[tx-robot] updated from transifex 2018-02-01 01:11:06 +00:00
Morris Jobke 88d5f6ec63
Merge pull request #8127 from nextcloud/13-final-rc 
13.0.0 RC 4
 2018-01-31 20:31:17 +01:00
Morris Jobke 2cc1cdba6f
13.0.0 RC 4 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-31 17:31:18 +01:00
Morris Jobke c39a40f15f
Merge pull request #8126 from nextcloud/13-8121 
[stable13] Create the migrations table also with the UTF8mb4 collation
 2018-01-31 17:29:00 +01:00
Roeland Jago Douma dabce9685b
Merge pull request #8124 from nextcloud/app-nav-flex-margins-fix 
[stable13] Fixed app navigation flex margins
 2018-01-31 15:56:18 +01:00
Joas Schilling 119de6467f
Create the migrations table also with the UTF8mb4 collation 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-01-31 15:54:28 +01:00
John Molakvoæ (skjnldsv) 22c083b58a
Fixed app navigation flex margins 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-01-31 14:51:27 +01:00
Morris Jobke bb7a2b2329
Merge pull request #8073 from nextcloud/stable13-8069 
[stable13] do not catch and ignore ServerNotAvailable in the wrong spot
 2018-01-31 14:46:55 +01:00
Morris Jobke 10110e85eb
Merge pull request #8116 from nextcloud/8111_13 
[stable13] Only handle encrypted property on folders
 2018-01-31 14:46:18 +01:00
Nextcloud bot fb11969916
[tx-robot] updated from transifex 2018-01-31 01:11:04 +00:00
Roeland Jago Douma f924a6d7d9
Only handle encrypted property on folders 
Exposing the encrypted property is required for E2E. However, there is
no need to expose this on files as then it is server side encryption
(which the clients don't care about).

Better to not confuse the output.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-30 21:56:32 +01:00
Nextcloud bot c30e958dac
[tx-robot] updated from transifex 2018-01-30 01:11:20 +00:00
Nextcloud bot 7b227d8712
[tx-robot] updated from transifex 2018-01-29 01:11:05 +00:00
Nextcloud bot 5700467c29
[tx-robot] updated from transifex 2018-01-27 01:11:03 +00:00
Arthur Schiwon d61dd36fdd
do not catch ServerNotAvailable 
might cause the user to be unavailable (race condition).

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-01-26 15:35:26 +01:00
Morris Jobke d82d1a8a81
Merge pull request #8027 from nextcloud/13.0.0-last-rc 
13.0.0 RC3
 2018-01-26 15:27:57 +01:00
Morris Jobke fabf75a7d3
13.0.0 RC3 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-26 14:43:20 +01:00
Nextcloud bot 0aca61d73e
[tx-robot] updated from transifex 2018-01-26 01:11:04 +00:00
Nextcloud bot e79a755d08
[tx-robot] updated from transifex 2018-01-25 01:11:19 +00:00
Roeland Jago Douma d76f08dfbd
Merge pull request #8034 from nextcloud/13-8032 
[stable13] Fix missing clipboard icon in shared links
 2018-01-24 19:19:46 +01:00
Daniel Calviño Sánchez 326af0c9c3
Fix missing clipboard icon in shared links 
The clipboard icon in shared links appears either directly on the link
input field or, if any social sharing app is enabled, in a menu. The
clipboard icon uses the same CSS rules as other icons (like the
information icon) to be posioned on the end of the input field, and
those rules have to be "cancelled" when the icon is shown in the menu.

Fixes #7990

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-01-24 17:25:50 +01:00
Morris Jobke 52149d2c54
Merge pull request #8031 from nextcloud/7921_12 
[stable13] Removed additional and uneccessary request on password reset, to fix redirection afterwards.
 2018-01-24 17:24:51 +01:00
Morris Jobke a0f62b71c8
Merge pull request #8030 from nextcloud/7986_12 
[stable13] If the preview is size 0 it is invalid
 2018-01-24 16:40:44 +01:00
Roeland Jago Douma 1a21524f6f
Merge pull request #8025 from nextcloud/13-8020 
[stable13] Make sure we always know for sure if an avatar is generated or not
 2018-01-24 16:28:55 +01:00
Morris Jobke 76636dea9c
Merge pull request #8029 from nextcloud/13-7991 
[stable13] Send a proper response for status.php on trusted domain error
 2018-01-24 16:22:06 +01:00
Luca Adrian Lindhorst 6b954e6cd6
Removed additional and uneccessary request on password reset, to fix redirection afterwards. 
Signed-off-by: Luca Adrian Lindhorst <info@lucalindhorst.de>
 2018-01-24 16:14:37 +01:00
Roeland Jago Douma f259e1cb8c
If the preview is size 0 it is invalid 
* delete it
* throw a NotFound Exception
  - This should a proper 404 to the user
  - Next time it is then regenerated

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-24 16:11:36 +01:00
Morris Jobke 986623e2ac
Send a proper response for status.php on trusted domain error 
* fixes #7732

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-24 15:42:25 +01:00
Julius Härtl 0209690d55
Make sure we always know for sure if an avatar is generated or not 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-24 15:05:38 +01:00
Nextcloud bot 3b35c226ce
[tx-robot] updated from transifex 2018-01-24 01:11:02 +00:00
Robin Appelman 3d10c3ace5
increase the time we wait for smb notifications in the test 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-01-23 09:54:34 +01:00
Nextcloud bot 924298f740
[tx-robot] updated from transifex 2018-01-23 01:11:03 +00:00
Nextcloud bot 823a14fae6
[tx-robot] updated from transifex 2018-01-22 01:10:53 +00:00
Nextcloud bot 883817e62a
[tx-robot] updated from transifex 2018-01-21 01:11:04 +00:00
Nextcloud bot 4c431d39eb
[tx-robot] updated from transifex 2018-01-20 01:11:10 +00:00
Roeland Jago Douma 1ecf10e26d
Merge pull request #7963 from nextcloud/smb-2.0.4-13 
[13] update icewind/smb to 2.0.4
 2018-01-19 20:24:21 +01:00
Robin Appelman 31b922d2f5
update icewind/smb to 2.0.4 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-01-19 16:23:22 +01:00
Nextcloud bot bec72bf9ff
[tx-robot] updated from transifex 2018-01-19 01:11:08 +00:00
Morris Jobke 6719c7723a
Merge pull request #7940 from nextcloud/13.0.0-rc2-prep 
13.0.0 RC2
 2018-01-18 17:41:43 +01:00
Morris Jobke 0b3623a71d
13.0.0 RC2 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-18 17:05:46 +01:00