Mirrors/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2024-08-11 02:11:21 +02:00
Code Issues Actions 34 Packages Projects Releases Wiki Activity
12,635 Commits 395 Branches 1,017 Tags 5.4 GiB
670242c731
Commit Graph

4222 Commits

Author SHA1 Message Date
Jörn Friedrich Dreyer
eed63ae512 Merge pull request #4221 from owncloud/fix-3698 
Fix calculating size for empty folders
 2013-08-01 08:05:19 -07:00
Bjoern Schiessle
9253627327 cancel sharing if some users doesn't have a working encryption set-up. 2013-08-01 13:04:55 +02:00
Morris Jobke
30963d60bc Merge pull request #4155 from owncloud/mdb2schemareader-booleans 
Fix boolean support for xml schema definitions
 2013-08-01 02:09:01 -07:00
Morris Jobke
0d69feb12e Merge pull request #4208 from owncloud/scanner-php53 
Fix scanner hooks throwing errors
 2013-08-01 00:05:56 -07:00
Jenkins for ownCloud
b037f2dc6e [tx-robot] updated from transifex 2013-08-01 01:57:04 -04:00
Morris Jobke
50101a85a6 Merge pull request #3982 from owncloud/test_lastinsertid 
test lastinsertid
 2013-07-31 00:03:29 -07:00
Jenkins for ownCloud
761f40328c [tx-robot] updated from transifex 2013-07-31 02:01:45 -04:00
Thomas Müller
f35aadb576 Merge pull request #4227 from owncloud/fixing-testGetById-master 
implement a platform independent version of basename
 2013-07-30 08:39:53 -07:00
Thomas Müller
17c36b5074 fixes #4026 2013-07-30 10:26:42 +02:00
Jenkins for ownCloud
88e1ccbce3 [tx-robot] updated from transifex 2013-07-30 01:57:50 -04:00
Thomas Müller
f658852276 Merge branch 'master' into fixing-testGetById-master 2013-07-30 00:37:05 +02:00
Thomas Müller
085fdfec2f adding unit tests for OC_Util::basename 2013-07-29 23:32:03 +02:00
icewind1991
7c6246fa45 Merge pull request #4213 from owncloud/scanning-performance 
Cache: don't check if the parent exists in the cache if we are already sure it does
 2013-07-29 13:08:23 -07:00
Robin Appelman
74c54587ec better variable naming 2013-07-29 18:27:19 +02:00
Thomas Mueller
e2d3225e5a implement a platform independent version of basename 2013-07-29 18:24:05 +02:00
Robin Appelman
dea3472ad7 remove unneeded 'use' 2013-07-29 17:04:28 +02:00
Robin Appelman
64774f30ba dont need to explicitly pass by reference 2013-07-29 17:03:57 +02:00
Robin Appelman
d6c56b584a make MDB2Schema reader non static 2013-07-29 16:33:00 +02:00
Robin Appelman
fbbe0ebe77 add function to get config object from OC_Config 2013-07-29 16:32:37 +02:00
Michael Gapczynski
1faac6108c Use query to calculate folder size 2013-07-29 10:22:44 -04:00
Thomas Müller
954b5d9019 Merge pull request #4216 from owncloud/clean_php55_opcache 
Also clean PHP 5.5 opcache
 2013-07-29 04:40:01 -07:00
Jörn Friedrich Dreyer
05fa55f2eb always return int 2013-07-29 02:17:09 +02:00
Michael Gapczynski
dd4e33fe6b Fix calculating size for empty folders 2013-07-28 16:14:49 -04:00
Michael Gapczynski
c8e60900fc Move check so the variable will never be undefined 2013-07-28 15:32:48 -04:00
kondou
8cd671c207 Also clean PHP 5.5 opcache 2013-07-28 16:33:03 +02:00
Jenkins for ownCloud
48621115c1 [tx-robot] updated from transifex 2013-07-28 01:58:28 -04:00
Robin Appelman
e1e7b6a940 Cache: don't check if the parent exists in the cache if we are already sure it does 2013-07-27 11:36:27 +02:00
Jenkins for ownCloud
fa35650e0a [tx-robot] updated from transifex 2013-07-27 02:03:03 -04:00
Robin Appelman
59bdba9bac fix scanner hooks, cant use inside closures in php 5.3 2013-07-26 15:43:10 +02:00
Robin Appelman
1b50154c95 functions in OCP should be static 2013-07-25 15:25:17 +02:00
Andreas Fischer
75e93d041d Merge pull request #3887 from owncloud/apc_user_cache 
The APC User Cache doesn't return the cache_list anymore

* owncloud/apc_user_cache:
  Add ACPu memory cache
 2013-07-25 03:48:26 +02:00
Bart Visscher
25003fb213 Add ACPu memory cache 2013-07-24 21:50:15 +02:00
icewind1991
ff86b6f134 Merge pull request #4183 from owncloud/fix-group-id 
Fix group id naming fid->gid
 2013-07-24 11:09:47 -07:00
icewind1991
1986416248 Merge pull request #3898 from owncloud/sabre-objecttree 
WebDAV performance improvements
 2013-07-24 10:46:27 -07:00
Bart Visscher
4e3bfd8ddd Fix group id naming fid->gid 2013-07-24 17:54:31 +02:00
Jan-Christoph Borchardt
9b1866f1ac merge master 2013-07-24 16:31:01 +02:00
Robin Appelman
ad266a4253 Merge branch 'master' into sabre-objecttree 2013-07-24 15:53:48 +02:00
Björn Schießle
651479322b Merge pull request #4177 from owncloud/move_defaults_to_template_constructor 
Move defaults to template constructor
 2013-07-24 06:42:52 -07:00
icewind1991
98858e6f00 Merge pull request #3995 from owncloud/groups 
Refactoring of group management code
 2013-07-24 06:13:05 -07:00
Björn Schießle
75fd6d4fde initialize OC_Defaults in template constructorX 2013-07-24 11:51:21 +02:00
Morris Jobke
2622839fcf Merge pull request #4171 from owncloud/fix-config 
Fix config
 2013-07-24 00:48:43 -07:00
Thomas Müller
1a73e607bd Merge branch 'master' into more-themable-strings 
Conflicts:
	lib/template.php
 2013-07-24 09:35:33 +02:00
Thomas Müller
60ce492fac Merge branch 'master' into groups 2013-07-24 01:11:12 +02:00
Thomas Müller
5fc0535f1b Merge pull request #4090 from owncloud/cleanup-some-template-functions 
Cleanup some template functions
 2013-07-23 15:53:43 -07:00
Robin Appelman
fb40d9e1e6 Merge branch 'master' into groups 2013-07-23 22:06:03 +02:00
Bart Visscher
7ad38535e5 Merge pull request #3392 from owncloud/googledrive 
Switch to using Google Drive SDK, closes #2047
 2013-07-23 12:23:08 -07:00
Jan-Christoph Borchardt
93b227d803 shorten wording on config directory errors 2013-07-23 18:41:00 +02:00
Bart Visscher
485e8ab0a5 ignore config read failures 2013-07-23 17:38:37 +02:00
Bart Visscher
5caa7576d4 Revert "fix failing master branch - Test_Config::testWriteData" 
This reverts commit 8f93490ac4.
 2013-07-23 17:36:08 +02:00
Jörn Friedrich Dreyer
f7422ad132 Merge pull request #4150 from owncloud/better-error-handling 
Better error handling
 2013-07-23 08:30:02 -07:00