Vincent Petry
|
79ae3c4527
|
Allow XML entity loader for MDB2 schema loader
Forward port of 762b0d9 from stable6 to master
|
2014-03-03 14:17:51 +01:00 |
|
Vincent Petry
|
84a87b96af
|
Merge pull request #7482 from owncloud/reset-3rdparty-submodule
Update 3rdparty submodule
|
2014-03-03 13:59:21 +01:00 |
|
Arthur Schiwon
|
b968eed27b
|
remove remaining testing artefact
|
2014-03-03 10:20:37 +01:00 |
|
Arthur Schiwon
|
c7751c0795
|
intendetion. where did the whitespaces come from?
|
2014-03-03 10:20:31 +01:00 |
|
Arthur Schiwon
|
a8883f4ed2
|
LDAP: let proxy for multiple server access methods from Access
|
2014-03-03 10:20:25 +01:00 |
|
Morris Jobke
|
084050530c
|
Merge pull request #7486 from owncloud/l10n_docstrings
Fix some docstrings in l10n.php
|
2014-03-01 10:38:48 +01:00 |
|
Thomas Tanghus
|
eff7667d26
|
Merge pull request #7433 from owncloud/config_basic_auth
Config to disable basic_auth username checking
|
2014-03-01 06:08:32 +01:00 |
|
kondou
|
5d5306175f
|
Fix some docstrings in l10n.php
|
2014-03-01 03:38:35 +01:00 |
|
Thomas Müller
|
d802ae298f
|
Update 3rdparty submodule
|
2014-02-28 19:11:40 +01:00 |
|
Vincent Petry
|
88c9ae129e
|
Merge pull request #7480 from owncloud/sabredav-1.7.11
Update SabreDAV to 1.7.11
|
2014-02-28 19:07:31 +01:00 |
|
Thomas Müller
|
1dcb4f740a
|
Update SabreDAV to 1.7.11
|
2014-02-28 16:55:50 +01:00 |
|
Thomas Müller
|
dd32091016
|
Merge pull request #7444 from owncloud/fix/7443
remove unused code and fix wrong variable names - some PHPDoc updated
|
2014-02-28 14:48:21 +01:00 |
|
Morris Jobke
|
d3866754a4
|
Merge pull request #7471 from owncloud/fix-css-loading
CSS is now loaded directly instead via PHP
|
2014-02-28 14:19:36 +01:00 |
|
icewind1991
|
8a93a2e7d5
|
Merge pull request #7455 from owncloud/rawlist-fileinfo
Update rawlist to work with new fileinfo object
|
2014-02-28 12:36:56 +01:00 |
|
Thomas Müller
|
6335f855f9
|
Merge pull request #7470 from owncloud/abort-cancel
profile image: relabel technical 'Abort' to more widely used 'Cancel'
|
2014-02-28 11:57:24 +01:00 |
|
Lukas Reschke
|
4c4bb70cb6
|
CSS is now loaded directly instead via PHP
269f24cf96 was not changed in setup.php which prevented loading of CSS files in some environments (e.g. my local setup) for apps.
|
2014-02-28 11:14:18 +01:00 |
|
Jan-Christoph Borchardt
|
e78da036c1
|
profile image: relabel technical 'Abort' to more widely used 'Cancel'
|
2014-02-28 10:09:34 +01:00 |
|
Björn Schießle
|
61bc76fdd6
|
Merge pull request #7454 from owncloud/enc_remember_fopen_mode
[enc] remember original fopen access type in pre-proxy
|
2014-02-28 09:57:58 +01:00 |
|
Vincent Petry
|
fefd724858
|
Fixed wrong field name
This re-fixes an issue where the unencrypted size isn't updated
correctly when saving a text file in the UI multiple times.
Fixes #7467
|
2014-02-27 23:53:29 +01:00 |
|
Thomas Müller
|
93b8aba3a1
|
Merge pull request #7439 from owncloud/unit-test-for-7430
adding test for migrations on columns using keywords
|
2014-02-27 21:52:46 +01:00 |
|
Raghu Nayyar
|
e304809612
|
Merge pull request #7382 from jbtbnl/master
Remove necessity of icon class
|
2014-02-27 21:11:26 +05:30 |
|
Morris Jobke
|
7af846e656
|
Merge pull request #7452 from owncloud/icon-delete-hover
icons: automatically show delete hover instead of using explicit class
|
2014-02-27 14:44:29 +01:00 |
|
Morris Jobke
|
49b331be39
|
add BMP mimetype for BMP previews
|
2014-02-27 14:39:16 +01:00 |
|
Bjoern Schiessle
|
4ace1a273d
|
remember original fopen access type in pre-proxy because sometimes they change
during the fopen call, e.g. 'r' becomes 'r+' if we open an URL
|
2014-02-27 14:16:03 +01:00 |
|
Robin Appelman
|
7c92e2e3ad
|
Update rawlist to work with new fileinfo object
|
2014-02-27 14:04:19 +01:00 |
|
Thomas Müller
|
ba4b593f84
|
Merge pull request #7446 from owncloud/etag_assert_fixes
use assertSame and assertNotSame for etag checks
|
2014-02-27 13:51:14 +01:00 |
|
Thomas Müller
|
f62b8a7896
|
Merge pull request #7451 from owncloud/fix-jshint
rename config to camelcase
|
2014-02-27 13:37:18 +01:00 |
|
Morris Jobke
|
6fe1cf7ae4
|
Merge pull request #7449 from owncloud/remove-input-border
remove border from log in input fields, simpler and works better with themes
|
2014-02-27 13:24:44 +01:00 |
|
Jan-Christoph Borchardt
|
58bc6aee51
|
icons: automatically show delete hover instead of using explicit class
|
2014-02-27 12:48:25 +01:00 |
|
Jörn Friedrich Dreyer
|
2ba6cd4e2b
|
initialize etags of temporary storage
|
2014-02-27 12:44:07 +01:00 |
|
Raghu Nayyar
|
832f6e4e42
|
Merge pull request #7450 from owncloud/rename-advanced
Installation: relabel 'Advanced' to more descriptive 'Storage & database'
|
2014-02-27 16:56:28 +05:30 |
|
Jan-Christoph Borchardt
|
af467d92f6
|
Installation: relabel 'Advanced' to more descriptive 'Storage & database'
|
2014-02-27 12:24:14 +01:00 |
|
Thomas Müller
|
a5a671392c
|
rename config to camelcase
|
2014-02-27 12:16:58 +01:00 |
|
Jan-Christoph Borchardt
|
f0cd08ab5d
|
remove border from log in input fields, simpler and works better with themes
|
2014-02-27 12:13:09 +01:00 |
|
Vincent Petry
|
577e47e207
|
Merge pull request #7432 from owncloud/enc_cleanup_session_after_decrypt_all
close encryption session after decryption was finished
|
2014-02-27 11:10:45 +01:00 |
|
Jörn Friedrich Dreyer
|
131c12ad8d
|
use assertInternalType for typechecking
|
2014-02-27 09:51:26 +01:00 |
|
Jörn Friedrich Dreyer
|
39f2f564a9
|
use assertSame and assertNotSame for etag checks
|
2014-02-27 09:39:34 +01:00 |
|
Vincent Petry
|
22adc397de
|
Also quote old column name during DB migration
This fixes alter table commands that didn't quote the old column name
|
2014-02-27 09:09:16 +01:00 |
|
Thomas Müller
|
ab850b961d
|
remove unused code and fix wrong variable names - some PHPDoc updated
|
2014-02-26 23:56:46 +01:00 |
|
Thomas Müller
|
9e59e64c79
|
Merge pull request #7421 from owncloud/password-input
disable autocomplete for shared link password input, fix #7419
|
2014-02-26 22:21:00 +01:00 |
|
Thomas Müller
|
d4f15853e8
|
Merge pull request #7425 from owncloud/issue/7423
Translate string when an error occured while sending a forgot password mail
|
2014-02-26 22:19:57 +01:00 |
|
Thomas Müller
|
230e5e3788
|
let's name the column 'select' because this is a keyword on all platforms
|
2014-02-26 20:47:07 +01:00 |
|
Thomas Müller
|
459b5086d5
|
adding test for migrations on columns using keywords
|
2014-02-26 20:42:45 +01:00 |
|
kondou
|
da19109f40
|
Config to disable basic_auth username chacking
This can be confusing and/or annoying
|
2014-02-26 18:06:13 +01:00 |
|
Joas Schilling
|
922c1909f8
|
Translate string when an error occured while sending a forgot password mail
Fix #7423
|
2014-02-26 17:29:47 +01:00 |
|
Bjoern Schiessle
|
86b3cdc132
|
close encryption session after decryption was finished
|
2014-02-26 17:18:38 +01:00 |
|
Bart Visscher
|
7f05c23231
|
Merge pull request #3760 from IMM0rtalis/remove_logout_redirect_slash
- removed slash-adding for logout-header-redirect
|
2014-02-26 16:05:09 +01:00 |
|
Björn Schießle
|
b7385986ae
|
Merge pull request #7393 from owncloud/fix_path_in_sharing_results
fix path in sharing results if it is a file in the Shared folder
|
2014-02-26 15:19:30 +01:00 |
|
Jan-Christoph Borchardt
|
6c5cc46380
|
disable autocomplete for shared link password input, fix #7419
|
2014-02-26 14:48:15 +01:00 |
|
Thomas Müller
|
2f0db9af07
|
Merge pull request #7409 from owncloud/issue/5361
Add owncloud version to JS scope
|
2014-02-26 14:44:12 +01:00 |
|