b61f0f11c5
Move oc_isadmin to the config JS script
2014-02-20 10:26:05 +01:00
16262e3fd2
Move isadmin to template and rename it to oc_isadmin
2014-02-19 17:56:12 +01:00
952584e9c7
Merge pull request #7195 from owncloud/files-selectall
...
Do not send file list for select all on Download/delete
2014-02-19 14:33:24 +01:00
f9d4780d27
Merge pull request #7275 from owncloud/3rdparty-fix
...
fix 3rdparty submodule
2014-02-19 12:26:41 +01:00
4920373050
Merge pull request #7278 from owncloud/issue/7277
...
Add event parameter to keyup event
2014-02-19 12:20:47 +01:00
7330f61a94
Merge pull request #4799 from owncloud/tune_legacy_cache_webdav_properties_prefixing_master
...
Concatenate string in SQL instead of PHP
2014-02-19 11:58:48 +01:00
bcad6e641a
Merge pull request #7274 from owncloud/scrutinizer-patch-1
...
Scrutinizer Auto-Fixes
2014-02-19 11:51:04 +01:00
f944707a15
fix wrong removes
2014-02-19 11:50:17 +01:00
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
c196e59e88
Add event parameter to keyup event
...
Fix issue #7277
2014-02-19 10:25:52 +01:00
8caf77f7c9
fix 3rdparty submodule
2014-02-19 10:02:44 +01:00
eea1abae20
add unit tests for watcher policies
2014-02-19 09:52:51 +01:00
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
adaee6a5a1
Scrutinizer Auto-Fixes
...
This patch was automatically generated as part of the following inspection:
https://scrutinizer-ci.com/g/owncloud/core/inspections/cdfecc4e-a37e-4233-8025-f0d7252a8720
Enabled analysis tools:
- PHP Analyzer
- JSHint
- PHP Copy/Paste Detector
- PHP PDepend
2014-02-19 09:31:54 +01:00
1e321406ee
Merge pull request #7114 from owncloud/scrutinizer_documentation_patches
...
polish documentation based on scrutinizer patches
2014-02-19 07:04:37 +01:00
c6f4f85e27
Merge branch 'master' into scrutinizer_documentation_patches
...
Conflicts:
lib/private/migration/content.php
2014-02-18 18:31:33 +01:00
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
3cc7228c7c
Merge pull request #7253 from owncloud/preferences-caching
...
Add caching to OC\Preferences
2014-02-18 18:17:58 +01:00
8991e4505a
Merge pull request #6796 from owncloud/statementwrapper-bindparam
...
Add bindParam to the database statement wrapper
2014-02-18 18:13:57 +01:00
1e84d6b14b
Merge pull request #7190 from owncloud/appconfig-legacy-apps
...
Remove usage of legacy OC_Appconfig
2014-02-18 18:10:22 +01:00
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
3b1083f46e
Merge pull request #7176 from owncloud/style
...
Some style fixes
2014-02-18 17:30:26 +01:00
0beaeed713
Remove unused variables
2014-02-18 16:28:04 +00:00
589a7b220b
Fix poor spelling
2014-02-18 16:23:16 +00:00
2166683e3b
Allow setting the frequency of which the file watcher checks for updates
2014-02-18 16:34:25 +01:00
d18b9f6ea4
use a FileInfo object of the directory when generting the filelist
2014-02-18 15:39:35 +01:00
ac2e3ab373
remove some unneeded isset's
2014-02-18 14:27:55 +01:00
2e97a4cd32
Fix some phpdoc
2014-02-18 14:26:27 +01:00
b6f44e9a1d
Add caching to OC\Preferences
2014-02-18 11:21:39 +01:00
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
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
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
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
323cc1166b
Merge pull request #7235 from DavidVentura/master
...
small change for compatibility
2014-02-17 21:16:39 +01:00
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
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
798dc2c39a
Merge pull request #7231 from owncloud/proper-content-type
...
Use the proper content-type
2014-02-17 20:58:52 +01:00
c2adf033f2
use file icon as fallback instead of application icon, fix #7237
2014-02-17 20:58:33 +01:00
7e94d98b57
Merge pull request #7233 from owncloud/fix_5567
...
LDAP: improve wizard strings, fixes #5567
2014-02-17 20:57:56 +01:00
0f434038a7
add cbr/cbz file type icon, fix #6953
2014-02-17 20:48:32 +01:00
aa1a50f5b3
Consolidate two sections, per code review. Issue #1648
2014-02-17 12:57:54 -05:00
94b3296a71
Trashbin select all now doesn't send file list
...
- Fixed "delete" and "restore" actions to not send the file list when
all files are selected
- When some files are selected, sends the current dir
- Removed "dirListing" attribute as the backend is able to compute the
value based on the current dir
2014-02-17 18:34:59 +01:00
a282afcbbb
small change for compatibility
2014-02-17 13:27:07 -03:00
54f9db403f
LDAP: improve wizard strings, fixes #5567
2014-02-17 17:19:48 +01:00
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
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
fe065f5114
Merge pull request #6892 from owncloud/issuetemplate-enhancements
...
Issue template enhancements
2014-02-17 14:59:00 +01:00
fe9c982081
Removed quota question
2014-02-17 14:34:15 +01:00
a4b6d66703
Merge branch 'master' into migration_unit_tests
2014-02-17 11:03:57 +00:00
049e03c2b9
Finish basic testing of user export
2014-02-17 10:58:27 +00:00
Lukas Reschke
Vincent Petry
Thomas Müller
Jan-Christoph Borchardt
Morris Jobke
icewind1991
Joas Schilling
Robin Appelman
Scrutinizer Auto-Fixer
Tom Needham
tomneedham
Jörn Friedrich Dreyer
Matthew Caron
David
Arthur Schiwon