b0bb64c3ee
Added unit tests for relative_modified_date, changed method signature
...
Changed method signature of relative_modified_date template method to
make it possible to add a fromTime to compare with, mostly to make it
possible to test it.
Added unit test for date and time cases.
2013-10-03 13:55:05 +02:00
aedc427ffd
Fix fix of POST :P
2013-10-03 03:56:37 +02:00
965ce5719f
Modified PUT behaviour
...
Now only non-parable PUT requests return a stream resource.
2013-10-02 22:13:40 +02:00
ceeb22aa5f
fix unit tests
2013-10-02 11:25:44 +02:00
7cd8088845
Add assertions for ->params and array access with json
2013-10-01 20:15:03 +02:00
973bcccd7c
Implement PUT an PATCH support
2013-10-01 20:13:13 +02:00
bdad7697ac
Check if accessor matched request method.
...
It's easier to find errors in the code if an exception is thrown.
2013-10-01 20:13:13 +02:00
8603f956ab
Get urlParams registered before Request is instantiated
2013-10-01 19:03:34 +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
480aeb804f
Merge pull request #4459 from owncloud/appframework-master
...
Public API for OC6+ (includes AppFramework)
2013-09-30 04:11:28 -07:00
c62dc4fa80
Merge branch 'master' into fixing-4011-master
...
Conflicts:
lib/connector/sabre/directory.php
2013-09-30 11:36:08 +02:00
fdc87eaeb3
adding test testSimplePutFailsOnRename()
2013-09-30 11:30:34 +02:00
e3dee63339
Merge branch 'master' into fixing-4011-master
...
Conflicts:
lib/connector/sabre/directory.php
lib/connector/sabre/file.php
2013-09-30 10:46:50 +02:00
629faf6d34
Merge branch 'master' into appframework-master
2013-09-30 10:42:05 +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
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
6979fd343b
Merge branch 'master' into appframework-master
2013-09-28 20:39:19 +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
79da35b698
code cleanup
2013-09-27 13:41:23 +02:00
1ec7dff2fe
remove unused setUp()
2013-09-27 13:30:09 +02:00
4e9296a484
rename testTxtBlacklist to txtBlacklist
2013-09-27 11:33:37 +02:00
1b13101096
move fileView object initialization to testIsTransparent
2013-09-27 11:01:47 +02:00
aa8a145ba8
use dataProvider for txt blacklist test
2013-09-27 09:59:04 +02:00
1a398fba67
phpunit.xml: Port code coverage excludes from autotest to dist.
2013-09-26 19:05:47 +02:00
3dd19c7758
Merge pull request #4999 from owncloud/run-unit-tests-for-apps-master
...
run unit tests for apps as well
2013-09-26 07:09:32 -07:00
f8933eaf92
Remove $RUNTIME_NOAPPS - setting to false was not enough
2013-09-26 14:03:04 +02:00
b9d6539d76
Merge branch 'master' into ocs_share_api
2013-09-26 13:02:39 +02:00
d1b5d65622
run unit tests for apps as well
2013-09-26 12:02:06 +02:00
b11d8799c1
adding unit tests for ObjectTree::move()
2013-09-26 10:50:15 +02:00
469b309b21
Merge pull request #4892 from owncloud/vcategories_public
...
OC_VCategories => OC\Tags. Public interface and getter in server container
2013-09-25 14:24:37 -07:00
b5ac672864
Missing Test for the previous commit
2013-09-25 19:15:27 +02:00
826c6bec8f
expect unlinkto be called
2013-09-25 17:41:16 +02:00
3fa5271f10
adding unit tests
2013-09-25 17:34:28 +02:00
9e4fe10329
add test for txt blacklist
2013-09-25 10:20:40 +02:00
db39fede97
Merge branch 'master' into appframework-master
...
Conflicts:
apps/files/lib/helper.php
apps/files_trashbin/lib/helper.php
2013-09-25 09:52:12 +02:00
aaed871cee
Add factory class for the server container.
2013-09-24 17:10:01 +02:00
14a160e176
Adjust Tests and satisfy them
2013-09-24 17:10:01 +02:00
ee75a5b134
adding basic unit test for failing file_put_content operation
2013-09-24 15:44:02 +02:00
d101ff42f1
User: move checkPassword from User to Manager to not break API
2013-09-24 13:46:30 +02:00
52f1d5856d
add test data for cal and contact preview
2013-09-24 13:26:51 +02:00
235517f111
clear permissions cache when scanning a file
2013-09-24 00:57:58 +02:00
f022ea752d
Moar tests.
2013-09-23 23:39:36 +02:00
8fab9eef28
Add another test.
2013-09-23 23:39:36 +02:00
1bbeb12e2e
Updated method names and added a few more tests.
2013-09-23 23:39:36 +02:00
45f73feb69
OC_VCategories=>OC\Tags. Public interface + getter in server container
2013-09-23 23:39:36 +02:00
5d671a84b2
Merge pull request #4869 from owncloud/fixing-4866-master
...
recreate an etag within the scanner if the cache contains an empty etag
2013-09-23 07:13:12 -07:00
437858852c
Merge pull request #4856 from owncloud/fix-link-expiration
...
Fix Sharing "Expiration Date" for Shares of type Link (i.e. Token)
* owncloud/fix-link-expiration:
Perform expiration date checking before returning share data for token.
Tests whether expired/valid link share is still accessible.
2013-09-23 15:12:38 +02:00
d9a36ee82e
Move setUp() and tearDown() up in tests/lib/files/cache/scanner.php.
2013-09-23 12:45:02 +02:00
4a9f1cc74d
Merge remote-tracking branch 'owncloud/master' into fixing-4866-master
...
* owncloud/master: (98 commits)
[tx-robot] updated from transifex
files: when filtering search results, ensure results are children of the fakeroot not just path starting the same
setting a default on filecache column unencrypted_size
[tx-robot] updated from transifex
remove unneccessary lib in namespace
namespaces use upcasefirst parts when _ is left in namespace and files are named after their classes the autoloader will also find classes in the lib folder of an app its magic!
initialize variable
calculate correct permissions while toggle the password protection
make sure that both $permissions and $oldPermissions have the same type
Add copyright, remove starting blank line
update inherit docs comment
Fix insert/update/delete helper functions for oracle
Add missing return true statements to legacy preferences functions
Add missing static
Convert OC_Preference to object interface
fix race condition in lazy preview loading
use {count} instead of 'One' for more versatile translation
fix double translation of error message
use n to translate title
fixing typos and l10n
...
Conflicts:
tests/lib/files/cache/scanner.php
2013-09-23 12:44:11 +02:00
03eedb58fc
Merge pull request #4327 from owncloud/scanfile-remove
...
remove deleted files while scanning
2013-09-22 22:40:13 -07:00
811f680457
Merge pull request #4623 from owncloud/convert-oc_preferences
...
Convert OC_Preference to object interface
2013-09-22 10:45:56 -07:00
a1d4eb1f95
files: when filtering search results, ensure results are children of the fakeroot not just path starting the same
2013-09-22 01:24:12 +02:00
de2e6e137b
Do not convert boolean to integer in tests. put() already does this.
2013-09-21 00:12:13 +02:00
d84d548618
when storing back the data field 'encrypted' it is necessary to cast the boolean to an integer to make pg happy
2013-09-20 20:34:17 +02:00
445d34a2a9
Convert OC_Preference to object interface
2013-09-19 18:13:06 +02:00
b947aab802
some unit test for the new ocs share api
2013-09-19 14:39:51 +02:00
1274d6116d
updating php docs
2013-09-18 22:22:51 +02:00
dd62ccdb4e
Merge branch 'appframework-master' into public_cache
...
Conflicts:
lib/public/iservercontainer.php
lib/server.php
2013-09-18 13:20:07 +02:00
8b4f4a79e2
Still some session leftovers.
2013-09-17 19:46:08 +02:00
fe86182dac
OC_Cache namespace changes and add UserCache to server container.
...
Refs #4863
2013-09-17 17:46:33 +02:00
4cd0ee47a8
Merge branch 'master' into appframework-master
2013-09-17 09:39:45 +02:00
c8f9efeb94
etag changes are now propagated up the file tree
2013-09-16 23:32:17 +02:00
07714d9a72
Tests whether expired/valid link share is still accessible.
2013-09-16 21:24:16 +02:00
9d18e16c77
Merge pull request #4825 from owncloud/fix-sharing-expiration-oracle
...
Fix Sharing "Expiration Date" on Oracle
2013-09-16 12:16:44 -07:00
3c026b7cf6
recreate an etag within the scanner if the cache contains an empty etag
2013-09-16 12:09:15 +02:00
ad82a56f79
Merge branch 'master' into appframework-master
2013-09-15 21:18:59 +02:00
a58e176852
Merge pull request #4506 from owncloud/oc_avatars
...
OC Avatars
2013-09-14 16:00:36 -07:00
4480b0b164
Merge branch 'master' into appframework-master
2013-09-13 23:31:59 +02:00
6ff07f7681
Merge pull request #4712 from owncloud/fileapi-foreward
...
Provide an implementation of the fileapi for oc6 build on top of the old api
2013-09-13 14:31:11 -07:00
6eeb4d165c
- giving the user a new id for each test run in order to prevent reuse of e.g. permissions data in the database
...
- setting the current user id because \OC\FilesView relies on \OC_User::getUser()
2013-09-13 21:44:31 +02:00
5b3388c7c4
Merge branch 'master' into appframework-master
2013-09-13 20:56:49 +02:00
8c9add4d32
adding TB and GB to OC_Helper::humanFileSize
2013-09-13 17:22:45 +02:00
294f3632e0
Calculate dateInPast and dateInFuture.
2013-09-12 23:43:21 +02:00
20b799b2b4
Compare objects directly. Also use $expected and $actual.
2013-09-12 23:43:21 +02:00
bd1163b7d5
Add database tests for INSERT/SELECT date format.
2013-09-12 23:43:21 +02:00
261766fe49
Add comment explaining how $dateInFuture was picked.
2013-09-12 23:43:20 +02:00
f567bd1b8a
Coding style: { for methods start are supposed to be on the same line.
2013-09-12 23:43:20 +02:00
fb650deaf7
Expiration tests for sharing with groups.
2013-09-12 23:43:20 +02:00
cf97eac401
Do not repeat shareUserOneTestFileWithUserTwo() code.
2013-09-12 23:43:20 +02:00
e4b334c3f1
Make dates test class properties.
2013-09-12 23:43:20 +02:00
924a7046dd
Try to make Oracle happy by also specifying seconds.
2013-09-12 23:43:20 +02:00
1358b0078a
Test whether a still-valid user share is still accessible.
2013-09-12 23:43:20 +02:00
05c970095d
Test whether an expired user share is still accessible.
2013-09-12 23:43:20 +02:00
c9d2663159
Merge branch 'master' into fileapi-foreward
2013-09-12 21:43:35 +02:00
c9c5e1b97f
Merge branch 'master' into oc_avatars
2013-09-12 07:41:44 +02:00
b9167196fb
adjust test cases to namespace changes
2013-09-10 22:21:49 +02:00
1832eb8872
Pass view in \OC_Avatar to constructor and use $_ for enable_avatars
2013-09-09 16:57:46 +02:00
fbedd643f7
Merge pull request #4477 from owncloud/hooks-view
...
also emit hooks for views that are a subfolder of the user folder
2013-09-04 16:09:22 -07:00
820fd42161
Merge branch 'master' into oc_avatars
2013-09-04 12:56:40 +02:00
e5fc7b9dbe
Merge branch 'master' into clean_up_util
...
Conflicts:
lib/base.php
2013-09-02 07:58:06 +02:00
a22f9ff301
Provide an implementation of the fileapi for oc6 build on top of the old api
2013-09-01 19:47:48 +02:00
ab70b8c26e
Merge branch 'master' into oc_avatars
2013-09-01 17:52:13 +02:00
2d6a400381
Check for $this->fileInfo and @depend on testData()
2013-09-01 15:50:58 +02:00
235638e5ab
Merge branch 'master' into fix_4258
...
Conflicts:
lib/image.php
2013-08-31 23:48:23 +02:00
5d653753bd
Merge branch 'master' into oc_avatars
2013-08-31 12:56:36 +02:00
a9d6b59307
Merge branch 'master' into appframework-master
2013-08-31 01:38:44 +02:00
0869f9b655
Fix #4258 , clean up \OC_Image and improve its unittest
2013-08-30 21:08:37 +02:00
ecf187393b
Finish cropper, Get rid of TODOs, Improve \OCP\Avatar and "fix" unitests
2013-08-30 09:00:37 +02:00
bf9045f585
test case for hooks send from a non-default view
2013-08-29 15:25:38 +02:00
b7758d0f8d
Merge master into oc_preview
2013-08-29 10:50:55 +02:00
67c5be9f19
Merge branch 'master' into oc_avatars
...
Conflicts:
3rdparty
2013-08-28 16:44:11 +02:00
8d8a57de7f
Continue work on cropper
2013-08-28 16:39:00 +02:00
13514fd1ad
Merge pull request #4348 from owncloud/fixing-4343-master
...
fixes #4343
2013-08-27 04:26:51 -07:00
163269805a
Merge pull request #4507 from owncloud/existingusersfromgroup
...
return only existing users in group
2013-08-27 03:47:56 -07:00
a995e81686
Merge branch 'master' into appframework-master
2013-08-26 21:31:15 +02:00
1f5a55ddff
consolidate validity check for users in group class
2013-08-26 17:46:31 +02:00
29c28a45ca
Merge pull request #4292 from owncloud/add_appconfig_unittest
...
Add \OC_Appconfig Unittest
2013-08-26 04:07:18 -07:00
f19f8d1088
Fix avatar-unittest
2013-08-25 21:06:02 +02:00
5eb17aadb3
Fix spacing, have remove() and return JSON for custom-default-avatars
2013-08-25 21:06:02 +02:00
81cadd5ea3
Remove gravatar and no-avatar functionality, prepare for default avatars even more and reword some stuff
2013-08-25 21:06:02 +02:00
960262bbb4
Fix testDefaultAvatar
2013-08-25 21:06:01 +02:00
4521b54c67
Have /avatar.php as a central avatar-point
2013-08-25 21:04:49 +02:00
252548c62c
Improve styling & enable avatar-upload at personal page
2013-08-25 21:04:45 +02:00
2bfe662235
Add unittests & check filetype in setLocalAvatar()
...
TODO: Fix OC_Image->mimetype(), it always returns "image/png"
2013-08-25 21:04:09 +02:00
6ffa2a28d0
Merge branch 'master' into oc_preview
2013-08-23 23:10:37 +02:00
9e1016f7d2
Merge branch 'master' into fixing-4343-master
...
Conflicts:
lib/connector/sabre/quotaplugin.php
2013-08-22 17:59:39 +02:00
aa979f5dff
cleanup of tests
2013-08-21 00:44:39 +02:00
33db8a3089
kill superfluent classloader from tests - this approach might be of interest within the apps
2013-08-21 00:41:20 +02:00
395deacc67
reducing controller annotations to:
...
@PublicPage - No user logon is expected
@NoAdminRequired - the login user requires no admin rights
@NoCSRFRequired - the incoming request will not check for CSRF token
2013-08-20 21:21:21 +02:00
93194bb396
Introducing IContainer into public api
2013-08-20 17:21:14 +02:00
f1518a54df
Merge branch 'master' into clean_up_util
...
Conflicts:
lib/util.php
2013-08-20 17:20:30 +02:00
0fa8f38076
fixing broken test
2013-08-20 16:51:12 +02:00
72e1a8d83b
fixing require to Pimple
2013-08-20 12:47:23 +02:00
d7dde3cfbc
Merge pull request #4467 from owncloud/storage-wrapper-quota
...
Move quota logic from filesystem proxy to storage wrapper
2013-08-19 03:38:55 -07:00
f2702ff1ca
Merge master into oc_preview
2013-08-19 11:24:17 +02:00
d8c71ba734
merge master in storage-wrapper-quota
2013-08-18 11:34:56 +02:00
9e8a6b704d
Add _many_ newlines at the end of files
2013-08-18 11:06:59 +02:00
fde9cabe97
initial import of appframework
2013-08-17 11:16:48 +02:00
9c5416fe4a
Clean up \OC\Util
...
- Use camelCase
- Add some phpdoc
- Fix some indents
- Use some more spacing
2013-08-15 15:57:32 +02:00
4b5fb08c2c
Merge master into oc_preview
2013-08-14 20:56:44 +02:00
1877a42a0d
Scanner: additional tests for reusing etags during scanning
2013-08-12 15:37:15 +02:00
0e3dea7111
adding test case for a numeric value
2013-08-09 23:36:23 +02:00
b6b1bc5d09
Add datetime test for numeric string.
2013-08-09 22:32:38 +02:00
a2ac5e0163
Merge pull request #4271 from owncloud/plural_translations
...
Plural translations
2013-08-08 10:34:28 -07:00
e38025ba67
Merge pull request #4151 from owncloud/doctrine-object
...
Move dbtype depending logic into object per type
2013-08-08 08:46:30 -07:00
fed1792510
adding unit tests for quota checks
2013-08-08 13:33:00 +02:00
d3a69bf4c6
adding unit tests to determine length
2013-08-08 11:04:40 +02:00
6c78152564
Proper WHERE – the table is called userid not user
2013-08-06 17:31:50 +02:00
d70a4a960d
Use setUpBeforeClass() and tearDownAfterClass()
2013-08-06 17:30:58 +02:00
b8bfebe51e
Use setUpBeforeClass() and tearDownAfterClass()
2013-08-06 17:26:12 +02:00
b560bb21f0
Clean up DB, after we're done with testing
2013-08-06 17:01:01 +02:00
3e7a86c6ec
remove deleted files while scanning
2013-08-06 15:59:06 +02:00
95a959b10b
merge master into doctrine-object
2013-08-06 15:43:58 +02:00
057d7aa108
Merge pull request #4321 from owncloud/add_unittests_kondou
...
Add unittests
2013-08-06 04:39:20 -07:00
87ad677151
Remove pointless unittest (search/result)
2013-08-05 19:38:52 +02:00
a51af39595
Add unittests
...
Unittests for:
- search/result
- util
- preferences
2013-08-05 14:47:14 +02:00
af983b843d
fix merge conflicts
2013-08-05 14:27:38 +02:00
19e3780ef2
remove unneeded vars from unit test
2013-08-05 10:21:51 +02:00
e04bf0aaeb
unit tests for plural translations added
2013-08-02 23:08:41 +02:00
56549dafce
Revert "Add null and emptystring tests to check NOT NULL"
...
This reverts commit c74f3d0b90
2013-08-02 21:27:33 +02:00
ed054e67d6
DB: remove invalid asserts
2013-08-02 20:10:26 +02:00
c74f3d0b90
Add null and emptystring tests to check NOT NULL
2013-08-02 15:59:33 +02:00
de0dc30d89
Update skipped tests messages
2013-08-02 15:00:12 +02:00
670242c731
Add \OC_Appconfig Unittest
2013-08-02 13:22:12 +02:00
20b688d4be
Optimize image and skip mimetype test
2013-08-01 20:17:43 +02:00
415e38fc50
Cover more cases
...
Use file_get_contents() and base64_encode(file_get_contents()),
to load from data and base64, to cover more cases
2013-08-01 20:17:43 +02:00
71f43c5fa1
Add OC_Image Unit Test
...
data() somehow does not return, what file_get_contents() returns,
so I skipped related tests.
2013-08-01 20:17:43 +02:00
eed63ae512
Merge pull request #4221 from owncloud/fix-3698
...
Fix calculating size for empty folders
2013-08-01 08:05:19 -07:00
30963d60bc
Merge pull request #4155 from owncloud/mdb2schemareader-booleans
...
Fix boolean support for xml schema definitions
2013-08-01 02:09:01 -07:00
50101a85a6
Merge pull request #3982 from owncloud/test_lastinsertid
...
test lastinsertid
2013-07-31 00:03:29 -07:00
409268f322
adding test case with no /
2013-07-30 08:54:39 +02:00
f658852276
Merge branch 'master' into fixing-testGetById-master
2013-07-30 00:37:05 +02:00
7425efade7
Merge branch 'master' into oc_preview
...
Conflicts:
3rdparty
lib/template.php
2013-07-30 00:34:36 +02:00
085fdfec2f
adding unit tests for OC_Util::basename
2013-07-29 23:32:03 +02:00
a4df982dc3
add tests for MDB2SchemaReader
2013-07-29 16:33:27 +02:00
afff750011
Add test for calculating size of newly empty folder
2013-07-29 10:23:14 -04:00
b8bd1e5a81
check type, assertgreaterthan
2013-07-29 02:17:09 +02:00
7e5ae8d780
test lastinsertid
2013-07-29 01:57:30 +02:00
e4132a61c9
Merge pull request #4093 from owncloud/storage-test-cleanup
...
Remove outdated unit tests for storage backend
2013-07-26 03:18:39 -07:00
9762a4dd95
Merge pull request #4191 from owncloud/autotest-show-skipped-tests
...
Add verbose to autotest phpunit, so we see skipped and incomplete tests.
2013-07-25 03:14:43 -07:00
763afa5064
Add verbose to autotest phpunit, so we see skipped and incomplete tests.
2013-07-25 02:43:50 +02:00
cd8f0c21ce
add quota storage wrapper
2013-07-25 00:31:51 +02:00
a853968f7d
move storage wrapper test to new namespace
2013-07-25 00:31:51 +02:00
10d3e63ce5
add quota streamwrapper that limits the amount of data that can be written to a stream
2013-07-25 00:31:51 +02:00
25003fb213
Add ACPu memory cache
2013-07-24 21:50:15 +02:00
98858e6f00
Merge pull request #3995 from owncloud/groups
...
Refactoring of group management code
2013-07-24 06:13:05 -07:00
2622839fcf
Merge pull request #4171 from owncloud/fix-config
...
Fix config
2013-07-24 00:48:43 -07:00
60ce492fac
Merge branch 'master' into groups
2013-07-24 01:11:12 +02:00
c517c845f6
Merge branch 'master' into storage-test-cleanup
...
Conflicts:
tests/lib/files/storage/storage.php
2013-07-24 01:01:36 +02:00
5fc0535f1b
Merge pull request #4090 from owncloud/cleanup-some-template-functions
...
Cleanup some template functions
2013-07-23 15:53:43 -07:00
fb40d9e1e6
Merge branch 'master' into groups
2013-07-23 22:06:03 +02:00
5caa7576d4
Revert "fix failing master branch - Test_Config::testWriteData"
...
This reverts commit 8f93490ac4
2013-07-23 17:36:08 +02:00
a2cdf8b91e
Merge pull request #3925 from berendt/reworking_OC_Files_Storage_AmazonS3
...
reworking of \OC\Files\Storage\AmazonS3
2013-07-22 02:19:27 -07:00
5965f3ecea
Split locating JS and CSS files to their own class
2013-07-21 21:36:15 +02:00
8f93490ac4
fix failing master branch - Test_Config::testWriteData
2013-07-21 11:13:29 +02:00
084cf0c202
Merge pull request #2221 from owncloud/doctrine
...
OC6: Implement Doctrine as the backend for OC_DB
2013-07-18 14:24:27 -07:00
e3ea3ed3c5
group: only pass backends that hold that specific group to the group constructor
2013-07-18 12:15:34 +02:00
a3ff771567
Merge pull request #4067 from owncloud/fixing-tests-win32-master
...
<<<EOL seems not to use proper end of lines on windows
2013-07-17 00:37:02 -07:00
b2bcc9774b
memcache: make base testcase abstract
2013-07-16 23:11:22 +02:00
cfac7fcd53
Storage: remove some unneeded strict tests of mtime behaviour
2013-07-16 23:07:35 +02:00
97f0bc1c4a
Storage: remove tests for search
2013-07-16 23:05:23 +02:00
e09ffb6f57
Merge pull request #2395 from owncloud/cache
...
Seperate the memory based cache and file based cache in OC_Cache
2013-07-16 13:25:07 -07:00
285f288cf3
Merge pull request #3959 from owncloud/buildNotExistingFileNameForView
...
Fix renaming using parenthesis
2013-07-16 12:06:53 -07:00
504089940d
mamcache: implement the ArrayAccess interface
2013-07-16 16:06:00 +02:00
8ad148feaf
memcache: some additional unit tests
2013-07-16 15:46:27 +02:00
0ae8eb4f5e
Merge branch 'master' into cache
2013-07-16 15:22:47 +02:00
7ba4269c26
<<<EOL seems not to use proper end of lines on windows
2013-07-15 10:28:14 +02:00
5549c77ec5
Merge branch 'master' into doctrine
...
Conflicts:
3rdparty
lib/db.php
lib/setup.php
tests/lib/db.php
tests/lib/dbschema.php
2013-07-13 12:01:14 +02:00
Vincent Petry
Thomas Tanghus
Morris Jobke
Thomas Müller
Andreas Fischer
Georg Ehrke
Bjoern Schiessle
Arthur Schiwon
Robin Appelman
Bart Visscher
Bernhard Posselt
kondou
Jörn Friedrich Dreyer
icewind1991
Owen Winkler
Michael Gapczynski