Commit Graph

12262 Commits

Author SHA1 Message Date
Jenkins for ownCloud 073464af0b [tx-robot] updated from transifex 2013-06-24 02:11:03 +02:00
Robin Appelman 909d279e55 Add a CLI script for manually triggering checking a folder for updates 2013-06-23 17:49:38 +02:00
Jenkins for ownCloud aaecfa18ed [tx-robot] updated from transifex 2013-06-23 02:05:39 +02:00
Jenkins for ownCloud 52ba86678a [tx-robot] updated from transifex 2013-06-22 02:11:35 +02:00
Thomas Müller d6650a51fe Merge pull request #3766 from owncloud/fix_display_name_edit
Correct new user display name output
2013-06-21 12:45:09 -07:00
Thomas Müller 65de0a5831 Merge pull request #3810 from owncloud/improve_webdavauth
improve error handling of webdavauth
2013-06-21 11:28:00 -07:00
Lukas Reschke 8c21cc64d0 Merge pull request #3811 from owncloud/string_fixes_encryption_settings
fix some strings in the admin settings of the encryption app
2013-06-21 09:59:15 -07:00
Björn Schießle f40f49851c fix some strings in the admin settings, it's not a 'recovery account' but a 'recovery key' 2013-06-21 14:49:01 +02:00
Georg Ehrke b0e1259295 improve error handling of webdavauth 2013-06-21 14:39:04 +02:00
Björn Schießle 76369b7424 encryption is LDAP compatible 2013-06-21 13:08:31 +02:00
Björn Schießle d10ad0d603 Squashed commit of the following:
commit 1345201c9da99a82f198e41fba24da6b0d7ae59a
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jun 20 16:27:46 2013 +0200

    add l10n support

commit bf2c79c8de8710e839a4a55642a91874c374fa1c
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jun 20 16:19:10 2013 +0200

    only init session if openssl extension is loaded

commit cbd52af6afbaa310bb1a534db64ff5e476dfd5d7
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jun 20 12:25:40 2013 +0200

    first disable app and than show error page

commit 55baf593179c433642de59552592e6b0f1932880
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jun 20 12:17:34 2013 +0200

    typo fixed

commit 1d9bef0b058e7cc3d511b81ae12d5a07660c75b2
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jun 20 12:15:40 2013 +0200

    move dependency check to the encryption app

commit c186e95da526f0470e20f014f1bd9513db5518ff
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jun 20 11:13:11 2013 +0200

    make sure that openssl is installed and loaded
2013-06-21 10:37:51 +02:00
Roland Hager a06d901e37 Fix: The check if upload_max_filesize or post_max_size is 0 fails if only one of them is 0.
$upload_max_filesize and $post_max_size need to be casted to (int) to match "=== 0"
2013-06-21 09:33:06 +02:00
Jenkins for ownCloud 8c923a85de [tx-robot] updated from transifex 2013-06-21 08:53:57 +02:00
kondou 7fd45e2875 Optimize pictures with optipng and scour 2013-06-21 04:24:40 +02:00
mvn23 59fa3055e1 Reviewed code for X-Sendfile2
Made some small changes which might have caused a segfault on ci.tmit.eu earlier.
2013-06-20 17:46:36 +03:00
Thomas Müller 59d3c5a575 Merge pull request #3796 from owncloud/gracefully_handle_teardown_in_scanner_test
skip teardown if cache has not been set up
2013-06-20 04:07:33 -07:00
Thomas Müller 4232ccbc6d Merge pull request #3792 from owncloud/scanfolder-remove
remove deleted files when re-scanning a folder
2013-06-20 04:02:10 -07:00
Jörn Friedrich Dreyer 7a7b54c4a2 skip teardown if cache has not been set up 2013-06-20 11:41:07 +02:00
blizzz c41f11a821 Merge pull request #3779 from shkdee/patch-1
Update user.php
2013-06-20 02:37:12 -07:00
mvn23 3f20a080fe Revert most changes for testing 2013-06-20 12:23:25 +03:00
Björn Schießle c4aa3fac7e Merge pull request #3788 from owncloud/more_error_messages
add some more error messages, in case something went wrong
2013-06-20 02:12:01 -07:00
Jörn Friedrich Dreyer 372f261fe3 remove unnecessary exception handling 2013-06-20 10:50:53 +02:00
Thomas Mueller 5d0a3f981c adding unit test for folder remove: testRemovedFolder() 2013-06-20 10:47:37 +02:00
Thomas Müller 5aaf807366 Merge pull request #3784 from owncloud/rescan-all
Give admins the ability to rescan the filesystem for multiple users at once
2013-06-20 01:41:49 -07:00
Jörn Friedrich Dreyer 91c0b81130 add missing backticks
guys, please ...
2013-06-20 10:18:29 +02:00
Thomas Mueller c1a3f015c9 Merge branch 'rescan-all' into scanfolder-remove 2013-06-20 08:17:31 +02:00
Jenkins for ownCloud 01ab79d460 [tx-robot] updated from transifex 2013-06-20 02:43:39 +02:00
Robin Appelman ff7e903f82 remove deleted files when re-scanning a folder 2013-06-20 00:42:34 +02:00
mvn23 a25bfa9291 Update files.php 2013-06-19 23:44:45 +02:00
Björn Schießle fe61230cc1 always have a defined return value 2013-06-19 16:55:31 +02:00
Michael Gapczynski e3171a701d Merge pull request #3783 from owncloud/improved_wording
fixed enghlish sentence
2013-06-19 07:06:04 -07:00
Björn Schießle e2e370f199 some more error messages 2013-06-19 15:58:34 +02:00
Björn Schießle 83d98e2d8b add some more error messages, in case something went wrong 2013-06-19 15:52:33 +02:00
mvn23 46f97f4c38 Implement X-Sendfile2 for resume support in LigHTTPd
LigHTTPd does not support HTTP Range headers with the X-Sendfile header in the way Apache does. Instead, it needs to be handled in the backend. This commit does exactly that, using the X-Sendfile2 header to send ranges of files.
To accomplish this without breaking web servers that don't support X-Sendfile2, a new variable MOD_X_SENDFILE2_ENABLED was introduced to separate this method from X-Sendfile and X-Accel-Redirect.
2013-06-19 15:36:48 +02:00
Robin Appelman 6778a45d45 use json to encode user list 2013-06-19 15:02:18 +02:00
Georg Ehrke efe4bfc693 update 3rdparty submodule 2013-06-19 13:43:11 +02:00
Georg Ehrke fb67b45841 comment out old code 2013-06-19 13:41:01 +02:00
icewind1991 cb41b88520 Merge pull request #3764 from owncloud/scanfolder-existing
Improve re-using existing data in the filescanner
2013-06-19 04:30:55 -07:00
Björn Schießle 99008ace36 fixed enghlish sentence, thanks to @MTGap 2013-06-19 12:05:45 +02:00
Björn Schießle 8406d3f7b1 also use the default theme if the theme is set to an empty string in the config.php 2013-06-19 11:58:29 +02:00
Björn Schießle 7f6a9e8fef fix lost password page, don't show checkbox is encryption is not enabled 2013-06-19 11:48:09 +02:00
Jörn Friedrich Dreyer 904227a0e4 Merge pull request #3661 from owncloud/fixing-windows-server-master
Fixing windows server master
2013-06-19 02:42:18 -07:00
Georg Ehrke 1fcbf8dd7a implemenet getNoCoverThumbnail 2013-06-19 10:21:55 +02:00
Thomas Müller dd231b530d Merge pull request #3773 from owncloud/port_3596
Users page: username instead of login name as col header to avoid confus...
2013-06-19 01:02:15 -07:00
Robin Appelman 85585ede02 allow scanning files for multiple users 2013-06-19 01:26:08 +02:00
Robin Appelman 0b74e71de8 fix updaters test cases 2013-06-19 00:26:47 +02:00
Frank Karlitschek 11194c69db Merge pull request #3765 from owncloud/hide-logo-claim
hide the logo claim in case the theme is not loaded
2013-06-18 14:14:34 -07:00
shkdee 4a480e4f53 Update user.php
Fixes $_setupedBackends[] into self::$_setupedBackends[] so that setuped backends are REALLY remembered and not instanciated many times.
2013-06-18 21:47:47 +03:00
Thomas Müller 7ee57dd42c Merge pull request #3774 from owncloud/fix_sql_in_vcategories
remove dangling AND in SQL statement
2013-06-18 08:14:55 -07:00
Jörn Friedrich Dreyer 78678be2b6 remove dangling AND in SQL statement 2013-06-18 16:18:19 +02:00