Commit Graph

12223 Commits

Author SHA1 Message Date
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
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
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
Arthur Schiwon 4dd0076e7c Users page: username instead of login name as col header to avoid confusion with other backends 2013-06-18 14:32:28 +02:00
Jenkins for ownCloud d991a9372b [tx-robot] updated from transifex 2013-06-18 02:11:10 +02:00
Victor Dubiniuk b2cb81f857 Replace display name only 2013-06-18 00:17:08 +03:00
Victor Dubiniuk fbbb6ef8ef Init dummy session first 2013-06-17 23:41:07 +03:00
Jan-Christoph Borchardt aaefa157fd hide the logo claim in case the theme is not loaded 2013-06-17 20:35:08 +02:00
Robin Appelman 2ed0e6e915 add tests for reusing existing data in scanner 2013-06-17 18:03:57 +02:00
Robin Appelman 63c898c064 Make rmdir recursive for local storage 2013-06-17 17:34:09 +02:00
Björn Schießle 0089437c25 Merge pull request #3727 from owncloud/fix_glob_escaping
only escape glob pattern
2013-06-17 06:35:47 -07:00
Björn Schießle 99c62dfd76 Merge branch 'master' into fix_glob_escaping
Conflicts:
	apps/files_trashbin/lib/trash.php
2013-06-17 14:51:08 +02:00
Björn Schießle efb026c664 don't normalize absolute local path 2013-06-17 14:42:18 +02:00
Jan-Christoph Borchardt 2a57763542 use history icon in Deleted Files template as well 2013-06-17 13:30:57 +02:00
Jan-Christoph Borchardt 1f518025a3 standardize on 32px loading spinner, decrease size in CSS where needed 2013-06-17 13:20:02 +02:00
Jan-Christoph Borchardt 0f904b3c9c use proper style for add icon 2013-06-17 12:58:43 +02:00
Jan-Christoph Borchardt d9dcba9a39 remove unused loading spinners, just have one 2013-06-17 12:35:25 +02:00
Jan-Christoph Borchardt 078835ee9d remove unused big images 2013-06-17 12:27:45 +02:00
Jan-Christoph Borchardt 344a73b173 use mail icon consistent with Mail app icon 2013-06-17 12:26:32 +02:00
Jan-Christoph Borchardt 73727c5b0b transparent background for lock icon 2013-06-17 12:22:09 +02:00
Jan-Christoph Borchardt 257ebc2830 use consistent icon for 'restore'/versions/history, also SVG 2013-06-17 12:18:45 +02:00
Jan-Christoph Borchardt 9e78e6b2e5 differentiate delete from close icon 2013-06-17 12:14:36 +02:00
Jenkins for ownCloud 6156d71832 [tx-robot] updated from transifex 2013-06-17 02:08:11 +02:00
Thomas Mueller 383e4c62b5 in case $_SERVER['HTTP_HOST']) is not set let's return localhost - better than nothing 2013-06-17 00:02:42 +02:00
Thomas Müller e013e7adea Merge pull request #3621 from owncloud/path-mimetype
seperate mimetype guessing from filename
2013-06-16 13:14:16 -07:00
Robin Appelman d42f7b85f3 Basic tests for getFileNameMimeType 2013-06-16 20:19:37 +02:00
Jenkins for ownCloud 8243d19050 [tx-robot] updated from transifex 2013-06-16 02:07:45 +02:00
Morris Jobke c99e7e97a3 Merge pull request #3301 from bastho/fix_filestrashbin_missing-sub-folder
Fix inexisting trashbin's sub-folders
2013-06-15 01:31:32 -07:00
Morris Jobke e0547a25ab if rename of file fails, the rename is undone in the view - #fix 2820
Changes:
 * OC.dialog -> OC.Notification
 * Added test
 * Fixed OC.Notification.show() issue for queued items
 * Highlight failed item and show notification
2013-06-15 09:58:27 +02:00
Jenkins for ownCloud ab411d2700 [tx-robot] updated from transifex 2013-06-15 02:07:18 +02:00
Jan-Christoph Borchardt 9dfba295cd Merge pull request #3733 from owncloud/email_template
E-mail templates (#3683)
2013-06-14 14:43:41 -07:00
Thomas Müller 126a0cac8d Merge pull request #3473 from opensaucesystems/master
Small update to user_webdavauth
2013-06-14 11:31:23 -07:00