Arthur Schiwon
097b6b8be9
LDAP: only read config from database, if configID is given. Not what we want to do when on-the-fly-testing settings from the admin page
2014-01-14 16:33:09 +01:00
Arthur Schiwon
bb6bad6b3c
remove unused variables
2014-01-14 16:33:02 +01:00
Arthur Schiwon
e4b7c6ef10
LDAP: fix TLS detection
2014-01-14 16:32:55 +01:00
Vincent Petry
c3a0b0d7f3
Merge pull request #6704 from owncloud/encryptedfoldersizecalc
...
Fix calculated folder size to use unencrypted size
2014-01-14 07:20:16 -08:00
Robin Appelman
7e4c80fd60
use different value for mtime and storage_mtime in test
2014-01-14 15:13:21 +01:00
Robin Appelman
4113042c8f
remove duplicate test class
2014-01-14 15:11:41 +01:00
Vincent Petry
ab21c25e38
Merge pull request #6759 from owncloud/extstorage-smbtimezonefix
...
Fixed timezone issue with SMB storage
2014-01-14 06:03:24 -08:00
Björn Schießle
a2a5ed3f4f
Merge pull request #6767 from owncloud/sharing_error_messages
...
it is not an urgent error... a DEBUG message is enough at this point
2014-01-14 06:02:48 -08:00
Robin Appelman
203d5d01ca
Use storage_mtime when determining if we can reuse cached data while scanning
2014-01-14 13:54:07 +01:00
Bjoern Schiessle
fa7f53e89d
it is not an urgent error... a DEBUG message is enough at this point
2014-01-14 13:38:41 +01:00
Thomas Müller
3c0e4a3bc6
Merge pull request #6752 from owncloud/silence-test-listener
...
no warnings within unlinkDir() within the TestCleanupListener
2014-01-13 15:47:39 -08:00
Andreas Fischer
cb071a9f35
Merge pull request #6755 from owncloud/remove-ru_RU-master
...
remove ru_RU - it has bee removed from transifex
* owncloud/remove-ru_RU-master:
remove ru_RU - it has bee removed from transifex
2014-01-14 00:44:34 +01:00
Vincent Petry
1eb5ebd58c
Fixed timezone issue with SMB storage
...
Now forcing smbclient to also run on UTC
2014-01-14 00:37:57 +01:00
Bjoern Schiessle
d1b47021f1
don't unshare on delete
2014-01-13 16:49:16 +01:00
Thomas Müller
92969052d7
remove ru_RU - it has bee removed from transifex
2014-01-13 16:41:10 +01:00
Vincent Petry
5e04b7f284
Merge pull request #6422 from ccerrillo/fixing-6301-external-mount-webdav-blank-files
...
Fixing Issue #6301 on master branch
2014-01-13 07:09:01 -08:00
Frank Karlitschek
82c840b3e6
Merge pull request #6734 from st3so/redirectfix
...
fixing typo in redirection query string
2014-01-13 06:55:52 -08:00
Thomas Müller
70650a004a
no warnings within unlinkDir() within the TestCleanupListener
2014-01-13 15:32:11 +01:00
Thomas Müller
fcf6653e64
Merge pull request #6694 from owncloud/fix-email-template-l10n
...
fix email template l10n, emphasize filename
2014-01-13 04:34:28 -08:00
Bjoern Schiessle
6845860470
keep response message
2014-01-13 12:27:05 +01:00
st3so
a2cae551f3
fixing typo in redirection query string
2014-01-12 15:49:32 +01:00
Lukas Reschke
85e00ad35a
Merge pull request #6713 from owncloud/files-filenameescapingfixes
...
Fixed various file name escaping issues in core apps
2014-01-12 03:45:30 -08:00
tsumi
7c1649fc24
Added SVG fallback to apps settings popup
...
This fix issue of calendar app with IE8, see issue report for details:
https://github.com/owncloud/calendar/issues/291
2014-01-10 21:19:30 +01:00
Myles McNamara
97be32e2e8
modify js to move upload wrapper, modify css to match core values
2014-01-10 14:07:20 -05:00
Myles McNamara
9ebffd6635
remove extra upload controls
2014-01-10 14:03:55 -05:00
Myles McNamara
0802b662be
fix upload button layout
2014-01-10 12:20:31 -05:00
Vincent Petry
1042733634
Fixed various file name escaping issues in core apps
...
- Refactored file tr lookup into FileList.findFileEl that uses
filterAttr to avoid escaping issues in jQuery selectors
- Fixed versions and sharing app to properly escape file names in
attributes
2014-01-10 15:02:26 +01:00
Joas Schilling
17c00f34d3
Add alt attribute for img elements
2014-01-10 10:19:08 +01:00
Joas Schilling
d95cab632b
Extend margin to avoid displaying a scrollbar
2014-01-10 10:17:19 +01:00
Joas Schilling
3ae17d0785
Fix unallowed child elements
2014-01-10 10:17:19 +01:00
Joan
2abea96462
Disabled internet checking as mentioned when in proxy mode
2014-01-10 09:33:35 +01:00
ben-denham
30f77f53d5
updated the unit test for OCP\Share::unshareAll() to verify that shares by all users are removed for an item.
2014-01-10 14:08:29 +13:00
Vincent Petry
4faba49f0a
Fix calculated folder size to use unencrypted size
...
The encrypted size was used when calculating folder sizes.
This fix now also sums up the unencrypted size and shows that one when
available.
2014-01-09 17:47:50 +01:00
Vincent Petry
b24c21b00f
Merge pull request #6687 from owncloud/sharing-fixpartfilehandling
...
Removed special handling of part files in shared storage rename
2014-01-09 06:16:43 -08:00
Thomas Müller
e0dbc1b67e
Merge pull request #6693 from owncloud/fixing-apache-login
...
Fixing apache login
2014-01-09 03:32:17 -08:00
Jan-Christoph Borchardt
76a7ae77a8
fix email template l10n, emphasize filename
2014-01-09 10:54:23 +01:00
Thomas Müller
c3829dfa61
rename user-id to loginname to stay consistent
2014-01-09 10:29:21 +01:00
Thomas Müller
22bd69f75c
set login name within apache auth backend
2014-01-09 10:28:24 +01:00
Thomas Müller
9b7c3a5c66
fixing PHPDoc and use cameCase names
2014-01-09 10:27:47 +01:00
blizzz
d8b8abb429
Merge pull request #6681 from owncloud/userreport
...
add command line option to get user number statistics
2014-01-08 10:41:39 -08:00
Arthur Schiwon
4585b4ea3f
Infowarning about 32bit
2014-01-08 19:41:10 +01:00
Vincent Petry
8eaa39f4e2
Removed special handling of part files in shared storage rename
...
This fixes the issue introduced by the transfer id which itself wasn't
taken into account by the shortcut code for part file in the shared
storage class.
2014-01-08 18:43:20 +01:00
Jan-Christoph Borchardt
0e7283ef39
Merge pull request #6686 from owncloud/fixes-6685-master
...
Fix ownCloud for php5.3.x
2014-01-08 07:33:12 -08:00
Thomas Müller
e35bca1c26
Fix ownCloud for php5.3.x
2014-01-08 16:07:01 +01:00
Thomas Müller
0bc0a60a93
Merge pull request #6680 from owncloud/core-preventunlinkstorageroot
...
Prevent deleting storage root
2014-01-08 05:32:36 -08:00
Arthur Schiwon
d7cb5ab080
add tests for user counting
2014-01-08 13:26:48 +01:00
Arthur Schiwon
cb6a3e2617
if backends have the same class name, sum their users up instead of overwriting
2014-01-08 13:24:28 +01:00
Vincent Petry
f642ad3961
Prevent deleting storage root
...
Storage mount points are not deletable, so make sure that the unlink
operation and its hooks aren't run in such cases.
Note that some storages might recursively delete their contents when
calling unlink on their root. This fix prevents that as well.
2014-01-08 13:17:36 +01:00
Thomas Müller
bb443ae937
Merge pull request #6515 from owncloud/autotest-enforcephpunitversion
...
Enforce required phpunit version
2014-01-08 03:30:05 -08:00
Arthur Schiwon
677d83d45f
LDAP: add tests for countUsers
2014-01-08 12:24:29 +01:00