Thomas Müller
51e6565aab
only text/plain is now used to generate text previews
...
blacklist implementation remove because no longer needed
2013-10-11 00:25:34 +02:00
VicDeo
26c0007a5f
Merge pull request #5263 from owncloud/fixing-5255-master
...
Proper behavior of resolvePath()
2013-10-10 09:27:45 -07:00
Morris Jobke
0641365a10
Merge pull request #4780 from AxelRb/master
...
On an auth failure the uid and the IP address should be logged to the st...
2013-10-10 07:21:36 -07:00
Thomas Müller
bc6e352ccd
the path need to be normalized before putting it into resolvePath()
...
otherwise the returned internalPath will not match followup calls to e.g. Cache::getID()
2013-10-10 16:06:26 +02:00
icewind1991
4c166fa361
Merge pull request #5247 from owncloud/hooks-view-same-start
...
ensure the view's root is a subfolder of the the default root, not only ...
2013-10-10 06:27:07 -07:00
Axel Roenn
9b0454380c
changed the argument to false for getValue , reformated else statement
2013-10-10 14:15:13 +02:00
Morris Jobke
e276ffedd3
Merge pull request #5257 from owncloud/files-ie8-regularfileactionsbroken
...
Fixed files view regular file actions in IE8
2013-10-10 05:14:09 -07:00
Morris Jobke
cf554fd804
Merge pull request #5182 from owncloud/fix-sharring-with-password-screen
...
Fix password screen for public shares
2013-10-10 04:49:47 -07:00
Morris Jobke
d968843bf6
Merge pull request #5244 from owncloud/more-css-fixes
...
More css fixes
2013-10-10 04:48:11 -07:00
blizzz
666e52a46b
Merge pull request #5114 from owncloud/ldap_uuid_attr_groups
...
LDAP: allow different UUID attributes for groups and users
2013-10-10 03:27:28 -07:00
Vincent Petry
bf00ccd1d6
Fixed files view regular file actions in IE8
...
Fixes #5256
A missing closing span broken the container in IE8 which prevented the
file actions to be appended properly.
2013-10-10 12:21:02 +02:00
Robin Appelman
1378af838c
merge master into hooks-view-same-start
2013-10-10 11:34:30 +02:00
VicDeo
1cb47bf777
Merge pull request #5221 from owncloud/fixing-5217-master
...
fixing php 5.3 compatibility
2013-10-10 01:55:18 -07:00
Björn Schießle
6053007768
Merge pull request #5210 from owncloud/sharing_search_users_fix
...
find users which are in the same group
2013-10-10 01:50:51 -07:00
Frank Karlitschek
1a899ac4c3
Merge pull request #5232 from owncloud/fixing-webdav-touch-master
...
due to internal implementations touch will always be successful - $mtime...
2013-10-10 01:49:59 -07:00
Frank Karlitschek
ec4fd35468
Merge pull request #5245 from owncloud/file_put_contents-no-create
...
don't trigger the create hooks when if the file already exists for file_put_contents
2013-10-10 01:20:07 -07:00
Robin Appelman
7f8eeb0474
ensure the view's root is a subfolder of the the default root, not only starting the same
2013-10-09 20:46:43 +02:00
Robin Appelman
38c563dcdc
don't trigger the create hooks when if the file already exists for file_put_contents
2013-10-09 20:34:18 +02:00
Vincent Petry
3a3819b303
Merge pull request #5134 from owncloud/trashbin-homeiconbroken
...
Do not call changeDirectory() when no dir set on breadcrumb
2013-10-09 09:01:43 -07:00
Björn Schießle
223adc3167
Merge pull request #5230 from owncloud/trashbin_fixes
...
Trashbin fixes
2013-10-09 08:27:54 -07:00
Axel Roenn
08a0435704
Added the config option to log ip addresses , default false
2013-10-09 17:21:35 +02:00
Bjoern Schiessle
7ab4fef7a9
update file summary after group delete/restore
2013-10-09 16:17:43 +02:00
Thomas Müller
27738fc4f5
due to internal implementations touch will always be successful - $mtime will be stored in the cache
...
from desktop client perspective it is necessary to set the mtime under every condition
2013-10-09 15:35:09 +02:00
Frank Karlitschek
45510f2fe0
6.0 alpha 1
2013-10-09 13:54:41 +02:00
Vincent Petry
599383c8b1
Merge pull request #5183 from owncloud/login-warningstyle
...
Fixed login warning style
2013-10-09 04:18:14 -07:00
Bjoern Schiessle
46bce8e540
fix checkbox
2013-10-09 13:15:53 +02:00
Bjoern Schiessle
51cfdb32b1
fix indention
2013-10-09 12:43:56 +02:00
Bjoern Schiessle
31a91ef892
fix group delete/restore
2013-10-09 12:35:15 +02:00
Thomas Müller
9637ca3ae8
Merge pull request #5070 from owncloud/smb-streamwrapper-fixes
...
Various fixes for the streamwrapper based SMB backend
2013-10-09 03:05:51 -07:00
Bjoern Schiessle
9e3d28871e
fix delete/restore individual files
2013-10-09 12:01:25 +02:00
Vincent Petry
01371e3187
Fixed login warning style #5065
...
Removed bold so it takes less space and set alignment to left.
2013-10-09 11:15:54 +02:00
Bjoern Schiessle
4404963918
fix trashbin layout
2013-10-09 11:11:55 +02:00
Björn Schießle
b4df4cc61d
Merge pull request #5219 from owncloud/catch_wrong_timezone
...
catch unknown timezone and fall-back to UTC
2013-10-09 01:59:09 -07:00
Bjoern Schiessle
c1e5725db9
changed default time format to ISO8601
2013-10-09 10:40:20 +02:00
Morris Jobke
a18ebac108
Merge pull request #5213 from owncloud/files-filesappdetectionhint
...
Added filesApp flag as input field for files app detection
2013-10-08 15:45:40 -07:00
Andreas Fischer
fe64f7b900
Merge pull request #5032 from owncloud/fixing-5006-master
...
Test OC_User_Database in Test_User_Database instead of OC_User_Dummy.
* owncloud/fixing-5006-master:
Use strict comparison === instead of ==.
Adjust return value tests for checkPassword() to what OC_User_Example says.
Make OC_User_Dummy::checkPassword() compatible with OC_User_Example.
Use parent:: in Test_User_Database::getUser().
Test_User_Backend::getUser() does not return an array, it returns a string.
Test OC_User_Database in Test_User_Database instead of OC_User_Dummy.
2013-10-08 23:17:51 +02:00
Thomas Müller
7bd5352509
php 5.3 compatibility for \OC\AppFramework\DependencyInjection\DIContainer
2013-10-08 23:14:08 +02:00
Thomas Müller
8a06f2e128
php 5.3 compatibility for Test_Files_Sharing_Api
2013-10-08 23:05:19 +02:00
Thomas Müller
51b581a84d
php 5.3 compatibility for \OC\Files\Storage
2013-10-08 23:00:41 +02:00
Thomas Müller
24e99016a9
Merge pull request #5188 from owncloud/master-delete-user
...
User::delete should return bool
2013-10-08 13:28:19 -07:00
Thomas Müller
6f3c49dabb
fixing php 5.3 compatibility
...
PHP Fatal error: Can't inherit abstract function OCP\ISession::set() (previously declared abstract in OC\Session\Session)
2013-10-08 21:52:54 +02:00
Bjoern Schiessle
3cf4c46c43
catch unknown timezone and fall-back to UTC
2013-10-08 20:42:35 +02:00
Andreas Fischer
75588fc0b6
Use strict comparison === instead of ==.
2013-10-08 20:03:16 +02:00
Andreas Fischer
114e9d4403
Adjust return value tests for checkPassword() to what OC_User_Example says.
2013-10-08 19:57:37 +02:00
Andreas Fischer
6eab36a89b
Make OC_User_Dummy::checkPassword() compatible with OC_User_Example.
...
The user id has to be returned.
2013-10-08 19:57:37 +02:00
Andreas Fischer
1f11dc7200
Use parent:: in Test_User_Database::getUser().
2013-10-08 19:36:37 +02:00
Andreas Fischer
46cd3082b0
Test_User_Backend::getUser() does not return an array, it returns a string.
2013-10-08 19:36:37 +02:00
Andreas Fischer
00a0588807
Test OC_User_Database in Test_User_Database instead of OC_User_Dummy.
2013-10-08 19:36:37 +02:00
Björn Schießle
76bdd6bc81
Merge pull request #5173 from owncloud/set_timezone_for_log
...
let admin specify timezone for log file entries
2013-10-08 09:27:13 -07:00
Vincent Petry
cddb85c588
Added filesApp flag as input field for files app detection
...
Since the files app can be reached under multiple URLs, either root,
files.php or public.php, a flag has been added to the DOM to help apps
(like file viewers) to detect whether they are currently in the files
app.
2013-10-08 17:19:58 +02:00