78c60c25c8
only perform files upgrade in case there are actually entries in the old fscache table
2013-10-02 13:00:05 +02:00
1adadf36fc
Merge pull request #5071 from owncloud/fix-autoloader-master
...
Fix autoloader regression
2013-10-02 03:10:10 -07:00
ceeb22aa5f
fix unit tests
2013-10-02 11:25:44 +02:00
535ed8369f
Merge pull request #4894 from owncloud/fixing-4620-master
...
Fixing broken layout in master due to APC enabled
2013-10-01 17:51:33 -07:00
5bb4330ea4
Fix autoloader regression
2013-10-02 00:58:51 +03:00
9eab8b39df
Merge branch 'master' into fixing-4620-master
2013-10-01 22:57:46 +02:00
5ade595911
Merge pull request #5039 from owncloud/lib-private-master-2
...
Public API OC6 - introduce lib/private
2013-10-01 09:15:24 -07:00
e2fe71b6e7
Merge branch 'master' into lib-private-master-2
2013-10-01 16:11:59 +02:00
b66e492d6e
Merge pull request #5026 from owncloud/channels
...
put the current version and edition into a seperate file to simplify
2013-10-01 05:36:00 -07:00
6cda88b49d
add explanation
2013-10-01 14:28:59 +02:00
bf0f3bf0da
use a 4 digit number
2013-10-01 12:37:19 +02:00
02d6976263
Merge branch 'master' into lib-private-master-2
2013-09-30 21:29:58 +02:00
7c659eb291
use public api for session access from server container
2013-09-30 20:28:00 +02:00
bed27b603d
Merge branch 'master' into channels
...
Conflicts:
lib/util.php
2013-09-30 20:21:51 +02:00
2cf26ee0b1
put the current version and edition into a seperate file to simplify packaging. introduce update channels and build version for automated channel updates. More about that later
...
Conflicts:
lib/ocsclient.php
lib/util.php
2013-09-30 20:19:26 +02:00
69dd6af574
use ===
...
Shoudn't make a difference in this case but just in case
Conflicts:
lib/ocsclient.php
2013-09-30 20:15:16 +02:00
b948c1a1b6
prepare the updater for the new update channels
2013-09-30 20:14:18 +02:00
b58a464b86
Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabled
...
don't remember login if the encrypion app is enabled
2013-09-30 10:53:41 -07:00
8e0060405d
reorganize file in lib
2013-09-30 16:39:03 +02:00
9c9dc276b7
move the private namespace OC into lib/private - OCP will stay in lib/public
...
Conflicts:
lib/private/vcategories.php
2013-09-30 16:36:59 +02:00
a711399e62
[tx-robot] updated from transifex
2013-09-30 10:19:22 -04:00
d4fed61871
Merge pull request #5012 from owncloud/check_keyfiles_exists
...
check not only if the keyfile folder exists but also if it contains keyfiles
2013-09-30 06:55:56 -07:00
480aeb804f
Merge pull request #4459 from owncloud/appframework-master
...
Public API for OC6+ (includes AppFramework)
2013-09-30 04:11:28 -07:00
ebb2278a67
Merge pull request #4995 from owncloud/move-aborted-upload-detection-into-plugin-master
...
Move aborted upload detection into it's own sabedav plugin
2013-09-30 02:31:51 -07:00
629faf6d34
Merge branch 'master' into appframework-master
2013-09-30 10:42:05 +02:00
aaba0d83b5
fixing PHPDoc & typo
2013-09-30 10:03:07 +02:00
952433eae6
Merge branch 'master' into move-aborted-upload-detection-into-plugin-master
2013-09-30 09:21:37 +02:00
5899485ca1
Merge pull request #4969 from owncloud/fixing-4043-master
...
adding privilege check on move and rename operations
2013-09-30 00:20:34 -07:00
4032065ec6
Merge pull request #3563 from evgeni/curl-no-timeout
...
cURL does not honour default_socket_timeout
2013-09-30 00:08:32 -07:00
b6fc143074
cURL does not honour default_socket_timeout
...
SabreDAV uses cURL for the requests and as this does not honour
default_socket_timeout, setting it is useless and confusing as
people will expect the request to timeout faster than it actually
will do.
One has to use
curl_setopt($curl, CURLOPT_TIMEOUT, x)
or
curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, x)
but there is currently no way to make SabreDAV pass this to cURL.
2013-09-30 07:56:54 +02:00
9ba0edcadb
Merge pull request #4966 from owncloud/text_preview_blacklist
...
add blacklist to txt preview backend
* owncloud/text_preview_blacklist:
rename variable in testIsTransparent
rename testTxtBlacklist to txtBlacklist
move fileView object initialization to testIsTransparent
use dataProvider for txt blacklist test
add test for txt blacklist
add test data for cal and contact preview
add blacklist to txt preview backend
2013-09-29 23:20:34 +02:00
a79294771b
Merge pull request #4960 from owncloud/fixing-mirall-1014-master
...
handle error situation of rename proper
2013-09-29 12:49:10 -07:00
5462e199d3
Merge branch 'master' into appframework-master
2013-09-29 20:07:56 +02:00
88d5e8fbca
Merge pull request #5031 from zimba12/master
...
followup of #4032 - makes the settings-button bigger...
2013-09-29 09:26:47 -07:00
710d3f139f
followup of #4032 - makes the settings-button bigger and adds again padding at bottom of app-navigation
2013-09-29 01:46:23 -04:00
59e4ff7d24
[tx-robot] updated from transifex
2013-09-29 00:03:26 -04:00
adcb738e47
initialize $middleWares
2013-09-28 20:40:25 +02:00
6979fd343b
Merge branch 'master' into appframework-master
2013-09-28 20:39:19 +02:00
1097c3ce63
Merge pull request #5030 from owncloud/base_defaultavatar_text_on_displayname
...
Base defaultavatar text on displayname
2013-09-28 08:52:22 -07:00
24d092c4ba
Have uniform (wrong) indention
2013-09-28 17:49:07 +02:00
4907685405
Base defaultavatar text on displayname
...
Fix #4876
2013-09-28 16:46:53 +02:00
cb565a5f60
Merge pull request #5004 from owncloud/phpunit-dist-coverage-excludes
...
phpunit.xml: Port code coverage excludes from autotest to dist.
2013-09-28 06:50:34 -07:00
57f37c876b
delay middleware registrations
2013-09-27 17:15:26 +02:00
adff34cb8a
fixing error in initialization of TagManager
2013-09-27 17:08:48 +02:00
c5bcefe4db
rename variable in testIsTransparent
2013-09-27 14:55:37 +02:00
687ba053b7
Merge branch 'master' into appframework-master
2013-09-27 14:25:47 +02:00
735608f513
Merge pull request #4207 from owncloud/search_shared_files
...
add initial search in shared files
2013-09-27 05:18:12 -07:00
79da35b698
code cleanup
2013-09-27 13:41:23 +02:00
03d5ea6cec
check not only if the keyfile folder exists but also if it contains keyfiles
2013-09-27 13:34:48 +02:00
f47ff13abf
Merge pull request #5001 from owncloud/fixing-user-external-backends-master
...
prelogin apps have to be loaded within setupBackend() otherwise required...
2013-09-27 02:34:59 -07:00
Thomas Müller
Morris Jobke
Owen Winkler
Victor Dubiniuk
Frank Karlitschek
Evgeni Golov
Andreas Fischer
Alessandro Cosentino
kondou
Georg Ehrke
Bjoern Schiessle