Commit Graph

37190 Commits

Author SHA1 Message Date
Morris Jobke 5157f16d28 Merge pull request #3352 from nextcloud/public-page-guest-css-loader
Fix public page css fallback loading
2017-02-06 18:15:56 -06:00
Sandro Lutz fa1d607bfa Merge remote-tracking branch 'nextcloud/master'
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
2017-02-07 00:15:30 +01:00
Sandro Lutz ff3fa538e4 Add missing use statement for PublicEmitter
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
2017-02-07 00:12:19 +01:00
John Molakvoæ (skjnldsv) 5383cc6170
TOTP css
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-02-06 22:26:01 +01:00
Robin Appelman b55f5af7ea Merge pull request #3364 from nextcloud/sass-logging
Lower log levels of resource locator
2017-02-06 12:52:57 +01:00
Nextcloud bot fa96b9e356
[tx-robot] updated from transifex 2017-02-06 01:07:04 +00:00
Nextcloud bot e4a74568e6
[tx-robot] updated from transifex 2017-02-05 01:07:05 +00:00
Marius Blüm 9ce8437b8b Merge pull request #3353 from nextcloud/mobile-view-files-fix
Fix files mobile view
2017-02-04 21:00:40 +01:00
m3ntalsp00n dd9ee2db6f fix tests, longer wait time, update notification stub
Signed-off-by: m3ntalsp00n <m3ntalsp00n@gmail.com>
2017-02-04 18:51:52 +10:00
m3ntalsp00n fd40613d8e showUpdate funciton allows updated messages
Signed-off-by: m3ntalsp00n <m3ntalsp00n@gmail.com>
2017-02-04 15:47:09 +10:00
Nextcloud bot 03bbda913d
[tx-robot] updated from transifex 2017-02-04 01:07:20 +00:00
Morris Jobke 942465c8b1
fix unit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-03 11:52:01 -06:00
Robin Appelman 3d8a300b77
Lower log levels of resource locator
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-03 13:09:33 +01:00
Nextcloud bot 49bce91404
[tx-robot] updated from transifex 2017-02-03 01:07:21 +00:00
Christoph Wurst 5e728d0eda oc_token should be nc_token
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-02-02 21:56:44 +01:00
Morris Jobke 949fbdef33 Merge pull request #3359 from nextcloud/fix-sharing-app-description
Fix Sharing app description
2017-02-02 14:47:45 -06:00
Joas Schilling d318e2b005
Fix Sharing app description
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-02 16:22:21 +01:00
Nextcloud bot b946ec9d6c
[tx-robot] updated from transifex 2017-02-02 01:07:05 +00:00
Sandro Lutz 20f878b014 Fix typo for UserManager variable
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
2017-02-01 21:54:00 +01:00
Sandro Lutz 6feff0ceba Add check if UserManager is of type PublicEmitter before calling preLogin hook
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
2017-02-01 21:53:50 +01:00
Sandro Lutz e30d28f7eb Change where preLogin hook gets called
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
2017-02-01 21:53:42 +01:00
Sandro Lutz 6ab0a3215d Remove preLoginValidation hook
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
2017-02-01 21:53:29 +01:00
Sandro Lutz e14d50eb1f Fix indentation
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
2017-02-01 21:50:47 +01:00
Sandro Lutz 4ebcd5ac0b Add preLoginValidation hook
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
2017-02-01 21:50:25 +01:00
John Molakvoæ (skjnldsv) e0e5b32f94
Fix files mobile view
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-02-01 18:39:27 +01:00
John Molakvoæ (skjnldsv) 61442e2c33
Various fixes guest css
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-02-01 18:10:52 +01:00
John Molakvoæ (skjnldsv) 2c9d7eeb76
Fix public page css fallback loading
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-02-01 18:03:51 +01:00
Nextcloud bot 1952560ac7
[tx-robot] updated from transifex 2017-02-01 01:06:57 +00:00
John Molakvoæ (skjnldsv) 8d5bb0b908
Transparent white checkbox
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-31 19:29:30 +01:00
Morris Jobke db5af891c3 Merge pull request #3321 from nextcloud/revert-unintentional-change-of-log-timestamp-format
Revert unintentional log timestamp format change
2017-01-31 08:44:06 -06:00
Morris Jobke 5bad417e57 Merge pull request #2044 from nextcloud/login-credential-store
Login credential store
2017-01-30 19:30:04 -06:00
Morris Jobke e50320dc71 Merge pull request #3169 from nextcloud/update-doctrine
Update doctrine
2017-01-30 19:23:16 -06:00
Nextcloud bot 9a13fac418
[tx-robot] updated from transifex 2017-01-31 01:07:05 +00:00
Morris Jobke 5618287b68 Merge pull request #3282 from nextcloud/header-menu-arrow-up
Merge similar properties and standardize the arrow to the menu class
2017-01-30 17:23:10 -06:00
Joas Schilling 4e0c50fdd6
Update doctrine
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-30 17:22:33 -06:00
Morris Jobke 687e38c409 Merge pull request #2970 from nextcloud/notify-self-test
Add self-test for files_external:notify
2017-01-30 17:15:57 -06:00
Morris Jobke 2a6006b927
Fix config.sample.php
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-30 16:52:30 -06:00
blizzz f70f427a63 Merge pull request #3298 from nextcloud/downstream-26928
remove obsolete hack (#26928)
2017-01-30 18:01:06 +01:00
Arthur Schiwon 9983e05121
LDAP's checkPassword should only catch when a user was not found, fixes #2431
Also fixes error processing after ldap_search, due to different return format

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-30 17:06:51 +01:00
Joas Schilling 0a837ac64e
Revert unintentional log timestamp format change
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-30 15:06:23 +01:00
blizzz 64e9a1aec0 Merge pull request #3176 from nextcloud/default-value-datadir
Add proper default value for datadir
2017-01-30 13:01:24 +01:00
Christoph Wurst 9a036a2ae3 Merge pull request #3260 from nextcloud/various-scss-fixes
Various scss fixes
2017-01-30 11:34:39 +01:00
Nextcloud bot bbcb1dd2e0
[tx-robot] updated from transifex 2017-01-30 01:07:14 +00:00
Nextcloud bot f4de328695
[tx-robot] updated from transifex 2017-01-29 01:06:55 +00:00
Nextcloud bot b614547ff8
[tx-robot] updated from transifex 2017-01-28 01:06:59 +00:00
Jörn Friedrich Dreyer 6fd7d4efd0
remove obsolete hack (#26928)
* remove obsolete hack

> // file_get_contents() has a memory leak: https://bugs.php.net/bug.php?id=61961
was closed 4 years ago. we could also use the Common implementation

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-27 12:20:48 -06:00
Morris Jobke 8b95bd29ee Merge pull request #2822 from nextcloud/add-navigation-via-info.xml
Add navigation via info.xml (#26785)
2017-01-27 11:25:26 -06:00
Joas Schilling 05884bcd7c Merge pull request #3178 from nextcloud/default-value-logdateformat
fix default value for logdateformat
2017-01-27 12:08:57 +01:00
Robin Appelman 90c011379c
update autoloader
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-27 10:51:00 +01:00
Robin Appelman 76f8247516
Add since
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-27 10:44:48 +01:00