summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* this test works locally, let's see what out build server says...Bjoern Schiessle2013-07-311-3/+0
* fix searchUsers() call in group.phpBjoern Schiessle2013-07-311-1/+1
* fixing some unit testsBjoern Schiessle2013-07-302-6/+6
* we need to use the path relative to data/Bjoern Schiessle2013-07-301-4/+1
* handle error if we can't handle the given pathBjoern Schiessle2013-07-302-2/+7
* remove unused method, the right one is in util.phpBjoern Schiessle2013-07-301-4/+0
* adapt unit tests to the modified stream wrapperBjoern Schiessle2013-07-305-35/+35
* only show decrypt all files option if encrypted files are availableBjoern Schiessle2013-07-301-2/+1
* encrypt/decrypt file versionsBjoern Schiessle2013-07-301-3/+124
* check if app is enabledBjoern Schiessle2013-07-301-7/+8
* only write keyfiles if it was a new file, otherwise nothing changedBjoern Schiessle2013-07-301-38/+45
* use path relative to data/Bjoern Schiessle2013-07-301-4/+1
* improved error handlingBjoern Schiessle2013-07-302-14/+34
* working decrypt files methodBjoern Schiessle2013-07-296-37/+173
* add decryptall.phpBjörn Schießle2013-07-291-0/+14
* register decrypt all routeBjörn Schießle2013-07-291-0/+2
* add ajax call to decrypt all filesBjörn Schießle2013-07-293-1/+18
* user interface to allow user to decrypt all his files once the encryption app...Björn Schießle2013-07-296-9/+68
* [tx-robot] updated from transifexJenkins for ownCloud2013-07-28169-427/+572
* [tx-robot] updated from transifexJenkins for ownCloud2013-07-27647-17134/+15201
* Merge pull request #4199 from owncloud/login-cleanupJörn Friedrich Dreyer2013-07-261-0/+21
|\
| * IE8 login/install screen cleartype fixes and input box bordersJörn Friedrich Dreyer2013-07-261-0/+21
| * force dbs to stay in one lineJörn Friedrich Dreyer2013-07-241-1/+1
* | Merge pull request #4093 from owncloud/storage-test-cleanupBart Visscher2013-07-261-50/+3
|\ \
| * \ Merge branch 'master' into storage-test-cleanupThomas Müller2013-07-241447-13959/+89742
| |\ \
| * | | Storage: remove some unneeded strict tests of mtime behaviourRobin Appelman2013-07-161-21/+2
| * | | Storage: remove tests for searchRobin Appelman2013-07-161-29/+1
* | | | functions in OCP should be staticRobin Appelman2013-07-251-1/+1
* | | | Merge pull request #4184 from owncloud/login_cleanup_oracleblizzz2013-07-253-32/+26
|\ \ \ \
| * | | | show tablespace only for oracle, hide dbhost for sqlite, remove unnecessary j...Jörn Friedrich Dreyer2013-07-242-31/+25
| * | | | force dbs to stay in one lineJörn Friedrich Dreyer2013-07-241-1/+1
* | | | | Merge pull request #4191 from owncloud/autotest-show-skipped-testsJörn Friedrich Dreyer2013-07-251-0/+1
|\ \ \ \ \
| * | | | | Add verbose to autotest phpunit, so we see skipped and incomplete tests.Andreas Fischer2013-07-251-0/+1
* | | | | | new version drop downBjörn Schießle2013-07-259-211/+221
* | | | | | Merge pull request #3887 from owncloud/apc_user_cacheAndreas Fischer2013-07-254-1/+55
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add ACPu memory cacheBart Visscher2013-07-244-1/+55
* | | | | | Merge pull request #4183 from owncloud/fix-group-idicewind19912013-07-241-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix group id naming fid->gidBart Visscher2013-07-241-1/+1
| |/ / / /
* | | | | Merge pull request #3898 from owncloud/sabre-objecttreeicewind19912013-07-243-4/+106
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into sabre-objecttreeRobin Appelman2013-07-241919-23655/+108991
| |\ \ \ \ \
| * | | | | | style fixRobin Appelman2013-07-191-1/+1
| * | | | | | improved copy operation for objecttreeRobin Appelman2013-06-301-0/+29
| * | | | | | use new ObjectTree in sabredavRobin Appelman2013-06-301-3/+4
| * | | | | | improved move operation for sabre's objecttreeRobin Appelman2013-06-301-0/+24
| * | | | | | make use of the fact that rmdir is already recursiveRobin Appelman2013-06-301-1/+0
| * | | | | | overwrite Sabre_DAV_ObjectTree with a faster getNodeForPathRobin Appelman2013-06-301-0/+49
* | | | | | | Merge pull request #4181 from owncloud/irods-obicewind19912013-07-241-0/+2
|\ \ \ \ \ \ \
| * | | | | | | use output buffering when including the irods librariesRobin Appelman2013-07-241-0/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #4173 from owncloud/login-cleanupJan-Christoph Borchardt2013-07-246-91/+274
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | merge masterJan-Christoph Borchardt2013-07-24176-2743/+13436
| |\ \ \ \ \