Thomas Müller
b0980b62ac
disable echo off
2013-10-09 17:48:46 +02:00
Björn Schießle
223adc3167
Merge pull request #5230 from owncloud/trashbin_fixes
...
Trashbin fixes
2013-10-09 08:27:54 -07:00
Bjoern Schiessle
7fe493fdb8
make sure that we only find file/folder shares
2013-10-09 17:25:58 +02:00
Axel Roenn
08a0435704
Added the config option to log ip addresses , default false
2013-10-09 17:21:35 +02:00
Thomas Müller
01810ec69a
adding missing call to make it work properly
2013-10-09 17:10:40 +02:00
Thomas Müller
44ece73c23
win32-phpunit.php is no longer required
2013-10-09 16:54:41 +02:00
Thomas Müller
b320b08af0
using phpunit command in order to get the arguments for coverage properly executed
2013-10-09 16:53:57 +02:00
Bjoern Schiessle
7ab4fef7a9
update file summary after group delete/restore
2013-10-09 16:17:43 +02:00
Bjoern Schiessle
38e5da05af
only encrypt file to users with encryption keys
2013-10-09 15:56:21 +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
Bjoern Schiessle
835f36cb09
find users which are in the same group
2013-10-08 16:43:23 +02:00
Frank Karlitschek
92d9263e24
Merge pull request #5146 from guruz/cache_enabled_apps_list
...
OC_App: Cache list of enabled apps
2013-10-08 07:17:36 -07:00
Morris Jobke
6284ab31de
fix escaping
2013-10-08 16:00:26 +02:00
Bjoern Schiessle
68e1dd1f23
make sure that we only remove file/folder shares
2013-10-08 16:00:18 +02:00
Thomas Müller
3f27fefdbe
fixing status code and formatting
2013-10-08 15:40:42 +02:00
Victor Dubiniuk
176c2f1502
Add unit tests
2013-10-08 16:33:56 +03:00
Thomas Müller
e7e53363ac
Merge pull request #5194 from owncloud/fixing-5172-master
...
adding check isDeletable() on $sourcePath
2013-10-08 06:18:29 -07:00
Björn Schießle
f49de34373
Merge pull request #5193 from owncloud/fix_5126_2
...
fix upload to /Shared
2013-10-08 06:15:43 -07:00
Thomas Müller
caa27824a9
catch specific file exceptions and convert them to proper http status code via webdav
2013-10-08 15:04:31 +02:00
Thomas Müller
7c6ed6ab33
catch exceptions while uploading and pass on the error message
2013-10-08 15:03:24 +02:00
Jenkins for ownCloud
209392587f
[tx-robot] updated from transifex
2013-10-08 07:24:19 -04:00
Thomas Müller
053b55721d
Merge branch 'master' into fixing-appframework-master
2013-10-08 12:13:24 +02:00
Bjoern Schiessle
6c45fab037
part file needs to have .part extension
2013-10-08 12:00:32 +02:00