icewind1991
|
2d5ab1a5c4
|
Merge pull request #7260 from owncloud/watcher-policy
Allow setting the frequency of which the file watcher checks for updates
|
2014-02-19 11:17:27 +01:00 |
|
Robin Appelman
|
eea1abae20
|
add unit tests for watcher policies
|
2014-02-19 09:52:51 +01:00 |
|
Vincent Petry
|
e517e642be
|
Merge pull request #7257 from owncloud/filelist-fileinfo
use a FileInfo object of the directory when generting the filelist
|
2014-02-19 09:40:11 +01:00 |
|
Thomas Müller
|
1e321406ee
|
Merge pull request #7114 from owncloud/scrutinizer_documentation_patches
polish documentation based on scrutinizer patches
|
2014-02-19 07:04:37 +01:00 |
|
Thomas Müller
|
c6f4f85e27
|
Merge branch 'master' into scrutinizer_documentation_patches
Conflicts:
lib/private/migration/content.php
|
2014-02-18 18:31:33 +01:00 |
|
Tom Needham
|
635b8f6b83
|
Merge pull request #7252 from owncloud/autocomplete-autocapitalize-autocorrect
do not autocapitalize fields on mobile, fix user name input
|
2014-02-18 18:26:56 +01:00 |
|
icewind1991
|
3cc7228c7c
|
Merge pull request #7253 from owncloud/preferences-caching
Add caching to OC\Preferences
|
2014-02-18 18:17:58 +01:00 |
|
Thomas Müller
|
8991e4505a
|
Merge pull request #6796 from owncloud/statementwrapper-bindparam
Add bindParam to the database statement wrapper
|
2014-02-18 18:13:57 +01:00 |
|
Thomas Müller
|
1e84d6b14b
|
Merge pull request #7190 from owncloud/appconfig-legacy-apps
Remove usage of legacy OC_Appconfig
|
2014-02-18 18:10:22 +01:00 |
|
Tom Needham
|
a573fe7d76
|
Merge pull request #6650 from owncloud/migration_unit_tests
User migration fix, and basic unit test
|
2014-02-18 17:35:49 +01:00 |
|
Lukas Reschke
|
3b1083f46e
|
Merge pull request #7176 from owncloud/style
Some style fixes
|
2014-02-18 17:30:26 +01:00 |
|
tomneedham
|
0beaeed713
|
Remove unused variables
|
2014-02-18 16:28:04 +00:00 |
|
tomneedham
|
589a7b220b
|
Fix poor spelling
|
2014-02-18 16:23:16 +00:00 |
|
Robin Appelman
|
2166683e3b
|
Allow setting the frequency of which the file watcher checks for updates
|
2014-02-18 16:34:25 +01:00 |
|
Robin Appelman
|
d18b9f6ea4
|
use a FileInfo object of the directory when generting the filelist
|
2014-02-18 15:39:35 +01:00 |
|
Robin Appelman
|
ac2e3ab373
|
remove some unneeded isset's
|
2014-02-18 14:27:55 +01:00 |
|
Robin Appelman
|
2e97a4cd32
|
Fix some phpdoc
|
2014-02-18 14:26:27 +01:00 |
|
Robin Appelman
|
b6f44e9a1d
|
Add caching to OC\Preferences
|
2014-02-18 11:21:39 +01:00 |
|
Jan-Christoph Borchardt
|
dafa8fc37e
|
do not autocapitalize fields on mobile, fix user name input. Also disable autocorrect and specify autocomplete
|
2014-02-18 10:58:00 +01:00 |
|
Thomas Müller
|
92560c5b86
|
Merge pull request #7243 from owncloud/core-sessionlifetimedefault
Now using PHP session lifetime as default value for the JS config
|
2014-02-18 10:30:25 +01:00 |
|
Thomas Müller
|
5d3fc03750
|
Merge pull request #7239 from owncloud/cbr-filetype-icon
add cbr/cbz file type icon, fix #6953
|
2014-02-18 10:23:54 +01:00 |
|
Vincent Petry
|
f9763e1fc5
|
Now using PHP session lifetime as default value for the JS config
This will fix the heartbeat when the session_lifetime config parameter
hasn't been set explicitly.
|
2014-02-17 21:33:04 +01:00 |
|
Jan-Christoph Borchardt
|
323cc1166b
|
Merge pull request #7235 from DavidVentura/master
small change for compatibility
|
2014-02-17 21:16:39 +01:00 |
|
icewind1991
|
617cbfed54
|
Merge pull request #7240 from owncloud/mimetype-fallback
use file icon as fallback instead of application icon, fix #7237
|
2014-02-17 21:06:15 +01:00 |
|
Vincent Petry
|
5a80339b51
|
Merge pull request #7211 from mattcaron/master
Fit shared videos to viewer, just like images. Issue #1648
|
2014-02-17 20:59:29 +01:00 |
|
Jörn Friedrich Dreyer
|
798dc2c39a
|
Merge pull request #7231 from owncloud/proper-content-type
Use the proper content-type
|
2014-02-17 20:58:52 +01:00 |
|
Jan-Christoph Borchardt
|
c2adf033f2
|
use file icon as fallback instead of application icon, fix #7237
|
2014-02-17 20:58:33 +01:00 |
|
Jörn Friedrich Dreyer
|
7e94d98b57
|
Merge pull request #7233 from owncloud/fix_5567
LDAP: improve wizard strings, fixes #5567
|
2014-02-17 20:57:56 +01:00 |
|
Jan-Christoph Borchardt
|
0f434038a7
|
add cbr/cbz file type icon, fix #6953
|
2014-02-17 20:48:32 +01:00 |
|
Matthew Caron
|
aa1a50f5b3
|
Consolidate two sections, per code review. Issue #1648
|
2014-02-17 12:57:54 -05:00 |
|
David
|
a282afcbbb
|
small change for compatibility
|
2014-02-17 13:27:07 -03:00 |
|
Arthur Schiwon
|
54f9db403f
|
LDAP: improve wizard strings, fixes #5567
|
2014-02-17 17:19:48 +01:00 |
|
Lukas Reschke
|
8a2cd0355d
|
Use the proper content-type
We should use the proper content-type `application/xml` instead of the default `text/html` here.
Backport requested.
|
2014-02-17 16:45:22 +01:00 |
|
Jan-Christoph Borchardt
|
84cd6e035e
|
Merge pull request #7132 from owncloud/issue/6920
Do not select input for all text input fields
|
2014-02-17 15:01:03 +01:00 |
|
Lukas Reschke
|
fe065f5114
|
Merge pull request #6892 from owncloud/issuetemplate-enhancements
Issue template enhancements
|
2014-02-17 14:59:00 +01:00 |
|
Vincent Petry
|
fe9c982081
|
Removed quota question
|
2014-02-17 14:34:15 +01:00 |
|
tomneedham
|
a4b6d66703
|
Merge branch 'master' into migration_unit_tests
|
2014-02-17 11:03:57 +00:00 |
|
tomneedham
|
049e03c2b9
|
Finish basic testing of user export
|
2014-02-17 10:58:27 +00:00 |
|
Björn Schießle
|
5a8d37023a
|
Merge pull request #7155 from owncloud/enc_improved_error_handling
[encryption] improved error handling
|
2014-02-17 11:13:44 +01:00 |
|
Bjoern Schiessle
|
6778dc5a4a
|
don't block login forever if we are stuck in the middle of the initial encryption
|
2014-02-17 10:03:57 +01:00 |
|
Bjoern Schiessle
|
f2f5769df7
|
catch errors during decryption
|
2014-02-17 10:03:57 +01:00 |
|
Bjoern Schiessle
|
2ab062193a
|
catch errors during initial encryption
|
2014-02-17 09:58:46 +01:00 |
|
Thomas Müller
|
750ffa8231
|
Merge pull request #7156 from owncloud/backgroundjob-public
Add the background job list to the public server container
|
2014-02-14 23:11:10 +01:00 |
|
Thomas Müller
|
9fac95c2ab
|
Merge branch 'master' into scrutinizer_documentation_patches
Conflicts:
lib/private/appconfig.php
|
2014-02-14 23:03:27 +01:00 |
|
Morris Jobke
|
df282d9ef8
|
Merge pull request #7207 from owncloud/fileinfo-serializable
Remove the JsonSerializable interface from \OC\Files\FileInfo
|
2014-02-14 22:11:54 +01:00 |
|
Matthew Caron
|
2887fb1f48
|
Fit shared videos to viewer, just like images. Issue #1648
|
2014-02-14 16:09:51 -05:00 |
|
Thomas Müller
|
41f0ad2d13
|
Merge pull request #7204 from owncloud/groupexists-duplicate
Remove duplicate call to groupExists
|
2014-02-14 21:53:03 +01:00 |
|
Robin Appelman
|
09502fcb36
|
remove the JsonSerializable interface from \OC\Files\FileInfo
|
2014-02-14 19:26:06 +01:00 |
|
blizzz
|
e2c0c0e256
|
Merge pull request #7206 from owncloud/fix_enc_tests
fileinfo is no longer a array
|
2014-02-14 19:09:46 +01:00 |
|
Bjoern Schiessle
|
2933668355
|
fileinfo is no longer a array
|
2014-02-14 18:05:59 +01:00 |
|