Morris Jobke
04783da829
Merge pull request #5276 from owncloud/fixing-5170-master
...
only text/plain is now used to generate text previews
2013-10-16 14:21:40 -07:00
Thomas Müller
fdeef5e874
Merge branch 'master' into fixing-appframework-master
...
Conflicts:
lib/private/appframework/middleware/security/securitymiddleware.php
tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
2013-10-16 15:45:55 +02:00
Thomas Müller
c3f7d22adc
Merge pull request #5067 from owncloud/urlParams_fix
...
Get urlParams registered before Request is instantiated
2013-10-16 06:42:09 -07:00
Thomas Müller
aca66270c7
accept text/markdown as well
2013-10-16 15:31:43 +02:00
Thomas Müller
d8a7b1e537
Merge branch 'master' into fixing-5170-master
2013-10-16 14:48:55 +02:00
Thomas Müller
fa3a65aea7
Merge pull request #5325 from owncloud/setup-fs-on-apache-auth-backend
...
file system is now initialized with apache authentication as well
2013-10-16 04:23:45 -07:00
Björn Schießle
ada94fb558
Merge pull request #5333 from owncloud/avater_with_encryption
...
avatars should also work with encryption after pr #5332 was merged
2013-10-16 01:34:05 -07:00
Vincent Petry
5f249e1a54
Prevent renaming/deleting mount points
...
Fixed permissions returned for mount points to not include update and
delete permissions.
Fixes #5291
2013-10-15 14:58:58 +02:00
Bjoern Schiessle
25320f19df
Merge branch 'master' into avater_with_encryption
2013-10-15 11:53:51 +02:00
Vincent Petry
fa341e49a8
Merge pull request #5341 from owncloud/fix-logout-link-html
...
Fix logout link HTML.
2013-10-15 00:33:00 -07:00
Andreas Fischer
06f9b7b862
Fix logout link HTML.
...
<a id="logout" href=/projects/owncloud/core/index.php?logout=true>
2013-10-14 22:31:13 +02:00
Thomas Müller
6df5c7ebd5
streamCopy() should return proper structure.
...
Callers of streamCopy() expect an array to be returned containing count and result.
2013-10-14 21:33:23 +02:00
Bjoern Schiessle
3380bd650f
avatars should also work with encryption after pr #5332 was merged
2013-10-14 17:30:24 +02:00
Thomas Müller
c97b52090e
Merge pull request #4867 from owncloud/fixing-4546-master
...
Adding detection of aborted uploads for chunked uploads
2013-10-14 06:39:32 -07:00
Thomas Müller
5318df3b3c
there shall be tabs
2013-10-14 14:51:25 +02:00
Thomas Müller
fb3829e8b8
file system is now initialized with apache authentication as well
2013-10-14 14:46:43 +02:00
Georg Ehrke
71601a7c6f
implement previews for markdown
2013-10-14 14:10:47 +02:00
Frank Karlitschek
258ccdfabe
case insensitive sort
2013-10-14 11:15:04 +02:00
Frank Karlitschek
a201a66878
fix style
2013-10-14 10:57:00 +02:00
Thomas Müller
a5e808defc
Merge branch 'master' into fixing-4546-master
...
Conflicts:
lib/private/connector/sabre/file.php
2013-10-14 10:56:50 +02:00
Frank Karlitschek
f06df170cb
finally fix the app sorting
2013-10-14 10:54:38 +02:00
Jenkins for ownCloud
f3336f8877
[tx-robot] updated from transifex
2013-10-13 20:33:30 -04:00
Tom Needham
14617682c8
Merge branch 'master' of github.com:owncloud/core into fix-unlogged-session-error
2013-10-12 09:15:59 +01:00
Tom Needham
6f8dd54788
Include exception message in log entry when session fails to start
2013-10-12 09:15:08 +01:00
Thomas Müller
dc58195c7f
Merge pull request #5207 from owncloud/fixing-4011-part2-master
...
[OC6] file upload exception handling
2013-10-11 10:35:17 -07:00
Tom Needham
cf7ea4bec5
Handle ownCloud logging when data dir not created
2013-10-11 17:16:37 +01:00
Tom Needham
cb110c0679
Log the session exception when ownCloud is not installed
2013-10-11 16:45:58 +01:00
Georg Ehrke
e28f7f8a33
remove php and js previews
2013-10-11 11:43:26 +02:00
Björn Schießle
4336d42ab0
Merge pull request #5233 from owncloud/enc_filter_users
...
only encrypt file to users with encryption keys
2013-10-11 01:48:02 -07:00
Thomas Tanghus
d75d80ba13
OCP\AppFramework\Controller\Controller => OCP\AppFramework\Controller
2013-10-11 10:07:57 +02:00
Jenkins for ownCloud
44a5b0bad0
[tx-robot] updated from transifex
2013-10-10 22:30:58 -04:00
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
Axel Roenn
9b0454380c
changed the argument to false for getValue , reformated else statement
2013-10-10 14:15:13 +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
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
Bjoern Schiessle
7fe493fdb8
make sure that we only find file/folder shares
2013-10-09 17:25:58 +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
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
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
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
