wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
14309 commits 157 branches 562 tags 714 MiB
Commit graph

103 commits

Author SHA1 Message Date
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
Frank Karlitschek
f06df170cb finally fix the app sorting 2013-10-14 10:54:38 +02: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
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
VicDeo
26c0007a5f Merge pull request #5263 from owncloud/fixing-5255-master 
Proper behavior of resolvePath()
 2013-10-10 09:27:45 -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
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
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
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
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
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
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
Thomas Müller
3f27fefdbe fixing status code and formatting 2013-10-08 15:40:42 +02: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
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
Bjoern Schiessle
6c45fab037 part file needs to have .part extension 2013-10-08 12:00:32 +02:00
Thomas Müller
c77f74e1de adding check isDeletable() on $sourcePath 2013-10-08 11:43:44 +02:00
Bjoern Schiessle
dd202d9ad3 updating a existing large file creates new file chunks. Therefore createFile() needs to check not only if we can write to the parent folder but also if we can update the existing file" 2013-10-08 11:27:08 +02:00
Bjoern Schiessle
0293d8e04f If a existing file in Shared/ with update permissions gets updated we need to write the .part file to a different place because we can't create new files in the Shared folder 2013-10-08 11:26:49 +02:00
Morris Jobke
2123ef57d8 Merge pull request #5181 from owncloud/fixing-chunked-upload-master 
Fixing broken chunked upload due to #4974
 2013-10-07 13:20:43 -07:00
Victor Dubiniuk
77f43c357c User::delete should return bool 2013-10-07 22:30:15 +03:00
Bart Visscher
6a93994a01 Merge pull request #4796 from owncloud/config-no-catch 
Remove the exception catch in OC_Config, this should be handled by a higher layer
 2013-10-07 11:45:13 -07:00
Thomas Müller
f496609085 the path for reassembling was created the wrong way 2013-10-07 17:34:21 +02:00
Bjoern Schiessle
6a411833b9 let admin specify timezone for log file entries 2013-10-07 15:34:48 +02:00
Thomas Müller
b48dffa9a3 Merge pull request #5072 from owncloud/apache-auth-master 
OC6 Apache Authentication
 2013-10-07 06:29:56 -07:00
Thomas Müller
730c80ff9c adding additional exceptions for special cases where creating a file might not be allowed 2013-10-07 15:11:47 +02:00
Morris Jobke
2b3c351601 Merge pull request #5162 from owncloud/fixing-l10n-master-2 
Fixing l10n master 2
 2013-10-07 05:07:47 -07:00
Frank Karlitschek
30faaf92b9 Merge pull request #5142 from owncloud/fix_version_cache_expire 
correctly expire cache if version file changed.
 2013-10-07 03:48:29 -07:00
Frank Karlitschek
3f29e4ebea a few styleguide fixes 2013-10-07 12:27:02 +02:00
Andreas Fischer
47ed6a5135 Move backend finding into its own method. 2013-10-07 12:26:25 +02:00
Thomas Müller
1e47468c53 Merge pull request #4974 from owncloud/fixing-4011-master 
error handling added in case file_put_contents is failing
 2013-10-07 02:58:00 -07:00
Thomas Müller
131d82e41e move call to print_unescaped() to template 2013-10-07 11:49:43 +02:00
Thomas Müller
4e0c4c8f34 move l10n factory into private 2013-10-07 10:00:23 +02:00
Thomas Müller
dbdf34402c remove outdated translation files 2013-10-07 09:59:15 +02:00