Thomas Mueller
|
5d0a3f981c
|
adding unit test for folder remove: testRemovedFolder()
|
2013-06-20 10:47:37 +02:00 |
|
Thomas Mueller
|
c1a3f015c9
|
Merge branch 'rescan-all' into scanfolder-remove
|
2013-06-20 08:17:31 +02:00 |
|
Robin Appelman
|
ff7e903f82
|
remove deleted files when re-scanning a folder
|
2013-06-20 00:42:34 +02:00 |
|
Michael Gapczynski
|
e3171a701d
|
Merge pull request #3783 from owncloud/improved_wording
fixed enghlish sentence
|
2013-06-19 07:06:04 -07: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 |
|
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 |
|
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 |
|
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 |
|
Jenkins for ownCloud
|
6156d71832
|
[tx-robot] updated from transifex
|
2013-06-17 02:08:11 +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 |
|
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 |
|
Thomas Müller
|
0ac7c5712a
|
Merge pull request #3721 from owncloud/oracle_setup_fixes
Oracle setup fixes
|
2013-06-14 11:21:02 -07:00 |
|
Thomas Mueller
|
f3d33a7d5b
|
remove » and « from the text mail because they will be escaped
|
2013-06-14 20:04:20 +02:00 |
|
Stephan Arts
|
ff64278a07
|
Do no translate "ownCloud - "
|
2013-06-14 18:02:35 +02:00 |
|
Stephan Arts
|
3cd7747e7b
|
Use templates to theme share e-mails (#3683)
|
2013-06-14 17:38:56 +02:00 |
|
Jan-Christoph Borchardt
|
2344654236
|
Merge pull request #3726 from owncloud/remove-outlines
remove dotted outlines in Firefox, fix #3712
|
2013-06-14 08:06:52 -07:00 |
|
Robin Appelman
|
398fe8bf32
|
reuse etag when doing a forced rescan
|
2013-06-14 17:05:52 +02:00 |
|
Robin Appelman
|
f10a4db889
|
scanner: give more percision about what data is reused during scanning
|
2013-06-14 16:58:14 +02:00 |
|
Jörn Friedrich Dreyer
|
9498cf959f
|
remove default tablespace in parameter
|
2013-06-14 15:54:45 +02:00 |
|
Thomas Müller
|
22d419b74f
|
No coverage for tests
|
2013-06-14 15:42:54 +02:00 |
|
Thomas Mueller
|
1ef66941a7
|
adding default to $hint within ctor of DatabaseSetupException
|
2013-06-14 15:38:09 +02:00 |
|
Robin Appelman
|
30c09d0c8b
|
split of scanning the childs of a folder
|
2013-06-14 15:35:06 +02:00 |
|
Thomas Müller
|
9d576de0bd
|
No coverage for settings/l10n
|
2013-06-14 15:17:02 +02:00 |
|
Björn Schießle
|
c3371812a0
|
fix indention
|
2013-06-14 15:14:23 +02:00 |
|
Björn Schießle
|
f91b02e9b6
|
only escape glob pattern
|
2013-06-14 15:07:06 +02:00 |
|
Thomas Müller
|
08f81f3f92
|
No coverage for lib/l10n and core/l10n
|
2013-06-14 14:24:58 +02:00 |
|
Jan-Christoph Borchardt
|
06fd7e0d21
|
remove dotted outlines in Firefox, fix #3712
|
2013-06-14 14:08:04 +02:00 |
|
Thomas Mueller
|
5c7d7549ea
|
coding style
|
2013-06-14 13:54:41 +02:00 |
|
Jörn Friedrich Dreyer
|
471b9c055a
|
use executeAudited in sabredav lock
|
2013-06-14 12:23:44 +02:00 |
|
Jörn Friedrich Dreyer
|
961a001af3
|
add missing backticks, use executeAudited in post_deleteGroup and post_removeFromGroup
|
2013-06-14 12:18:20 +02:00 |
|