91c0b81130
add missing backticks
...
guys, please ...
2013-06-20 10:18:29 +02:00
c1a3f015c9
Merge branch 'rescan-all' into scanfolder-remove
2013-06-20 08:17:31 +02:00
01ab79d460
[tx-robot] updated from transifex
2013-06-20 02:43:39 +02:00
ff7e903f82
remove deleted files when re-scanning a folder
2013-06-20 00:42:34 +02:00
a25bfa9291
Update files.php
2013-06-19 23:44:45 +02:00
0f32c5ec34
Merge branch 'master' into ext-fs-irods-master
2013-06-19 22:14:58 +02:00
fe61230cc1
always have a defined return value
2013-06-19 16:55:31 +02:00
e3171a701d
Merge pull request #3783 from owncloud/improved_wording
...
fixed enghlish sentence
2013-06-19 07:06:04 -07:00
e2e370f199
some more error messages
2013-06-19 15:58:34 +02:00
83d98e2d8b
add some more error messages, in case something went wrong
2013-06-19 15:52:33 +02:00
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
6778a45d45
use json to encode user list
2013-06-19 15:02:18 +02:00
efe4bfc693
update 3rdparty submodule
2013-06-19 13:43:11 +02:00
fb67b45841
comment out old code
2013-06-19 13:41:01 +02:00
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
99008ace36
fixed enghlish sentence, thanks to @MTGap
2013-06-19 12:05:45 +02:00
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
7f6a9e8fef
fix lost password page, don't show checkbox is encryption is not enabled
2013-06-19 11:48:09 +02:00
904227a0e4
Merge pull request #3661 from owncloud/fixing-windows-server-master
...
Fixing windows server master
2013-06-19 02:42:18 -07:00
1fcbf8dd7a
implemenet getNoCoverThumbnail
2013-06-19 10:21:55 +02:00
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
85585ede02
allow scanning files for multiple users
2013-06-19 01:26:08 +02:00
0b74e71de8
fix updaters test cases
2013-06-19 00:26:47 +02:00
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
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
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
78678be2b6
remove dangling AND in SQL statement
2013-06-18 16:18:19 +02:00
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
cc478d2f48
use ppt icon instead of preview
2013-06-18 13:53:02 +02:00
bea4376fd4
remove opendocument.php
2013-06-18 11:04:08 +02:00
d991a9372b
[tx-robot] updated from transifex
2013-06-18 02:11:10 +02:00
b2cb81f857
Replace display name only
2013-06-18 00:17:08 +03:00
fbbb6ef8ef
Init dummy session first
2013-06-17 23:41:07 +03:00
aaefa157fd
hide the logo claim in case the theme is not loaded
2013-06-17 20:35:08 +02:00
2ed0e6e915
add tests for reusing existing data in scanner
2013-06-17 18:03:57 +02:00
63c898c064
Make rmdir recursive for local storage
2013-06-17 17:34:09 +02:00
0089437c25
Merge pull request #3727 from owncloud/fix_glob_escaping
...
only escape glob pattern
2013-06-17 06:35:47 -07:00
99c62dfd76
Merge branch 'master' into fix_glob_escaping
...
Conflicts:
apps/files_trashbin/lib/trash.php
2013-06-17 14:51:08 +02:00
efb026c664
don't normalize absolute local path
2013-06-17 14:42:18 +02:00
2a57763542
use history icon in Deleted Files template as well
2013-06-17 13:30:57 +02:00
1f518025a3
standardize on 32px loading spinner, decrease size in CSS where needed
2013-06-17 13:20:02 +02:00
0f904b3c9c
use proper style for add icon
2013-06-17 12:58:43 +02:00
d9dcba9a39
remove unused loading spinners, just have one
2013-06-17 12:35:25 +02:00
1a933a9173
Merge branch 'master' into oc_preview
2013-06-17 12:31:02 +02:00
078835ee9d
remove unused big images
2013-06-17 12:27:45 +02:00
6082a0649c
stream first mb of movie to create preview
2013-06-17 12:27:26 +02:00
344a73b173
use mail icon consistent with Mail app icon
2013-06-17 12:26:32 +02:00
73727c5b0b
transparent background for lock icon
2013-06-17 12:22:09 +02:00
257ebc2830
use consistent icon for 'restore'/versions/history, also SVG
2013-06-17 12:18:45 +02:00
9e78e6b2e5
differentiate delete from close icon
2013-06-17 12:14:36 +02:00
Jörn Friedrich Dreyer
Thomas Mueller
Robin Appelman
mvn23
Björn Schießle
Michael Gapczynski
Georg Ehrke
icewind1991
Frank Karlitschek
shkdee
Arthur Schiwon
Victor Dubiniuk
Jan-Christoph Borchardt
Björn Schießle