summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4099 from owncloud/fixing-unix-timestamp-mssql-masterThomas Müller2013-07-171-2/+2
|\ | | | | fixing UNIX_TIMESTAMP() for mssql
| * fixing UNIX_TIMESTAMP() for mssqlThomas Mueller2013-07-171-2/+2
| |
* | Update build.xmlThomas Müller2013-07-171-4/+0
| |
* | Merge pull request #4042 from guruz/webdav_auth_check_existingMarkus Goetz2013-07-171-0/+21
|\ \ | |/ |/| WebDAV Auth Connector: Check if already logged in
| * WebDAV Auth Connector: Check if already logged inMarkus Goetz2013-07-171-0/+21
| |
* | Merge pull request #4067 from owncloud/fixing-tests-win32-masterThomas Müller2013-07-171-28/+8
|\ \ | | | | | | <<<EOL seems not to use proper end of lines on windows
| * | <<<EOL seems not to use proper end of lines on windowsThomas Mueller2013-07-151-28/+8
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-17540-1081/+1099
| | |
* | | memcache: make base testcase abstractRobin Appelman2013-07-161-1/+1
| | |
* | | Merge pull request #2395 from owncloud/cacheicewind19912013-07-1613-204/+403
|\ \ \ | | | | | | | | Seperate the memory based cache and file based cache in OC_Cache
| * | | memcache: also switch factory to prefixRobin Appelman2013-07-161-5/+5
| | | |
| * | | mamcache: implement the ArrayAccess interfaceRobin Appelman2013-07-162-1/+41
| | | |
| * | | memcache: some additional unit testsRobin Appelman2013-07-164-43/+60
| | | |
| * | | memchache: use prefix string instead of global flagRobin Appelman2013-07-164-29/+15
| | | |
| * | | split out memcache factory from base classRobin Appelman2013-07-162-24/+39
| | | |
| * | | Merge branch 'master' into cacheRobin Appelman2013-07-162008-85213/+118185
| |\ \ \
| * | | | Add memcached backendRobin Appelman2013-03-173-1/+103
| | | | |
| * | | | Seperate memory based cache from OC_CacheRobin Appelman2013-03-178-171/+210
| | | | |
* | | | | Merge pull request #3959 from owncloud/buildNotExistingFileNameForViewBart Visscher2013-07-162-5/+93
|\ \ \ \ \ | |_|/ / / |/| | | | Fix renaming using parenthesis
| * | | | Fix renaming using parenthesisBart Visscher2013-07-052-14/+48
| | | | |
| * | | | Make buildNotExistingFileName testable and write unittestsBart Visscher2013-07-052-1/+55
| | | | |
* | | | | Merge pull request #4075 from owncloud/markdown-readme-masterThomas Müller2013-07-162-20/+26
|\ \ \ \ \ | | | | | | | | | | | | Markdown readme master
| * | | | | update 'get in touch' linksJan-Christoph Borchardt2013-07-161-7/+4
| | | | | |
| * | | | | initial markdown verions of READMEThomas Müller2013-07-151-6/+15
| | | | | |
| * | | | | rename READMEThomas Müller2013-07-151-0/+0
| | |_|/ / | |/| | |
* | | | | Merge pull request #4076 from owncloud/fix_typos_kondouVicDeo2013-07-168-20/+20
|\ \ \ \ \ | | | | | | | | | | | | Fix some typos
| * | | | | Fix some typoskondou2013-07-168-20/+20
| |/ / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-16535-1095/+1147
| | | | |
* | | | | Merge pull request #3962 from owncloud/move-error-handlersBart Visscher2013-07-153-30/+56
|\ \ \ \ \ | |/ / / / |/| | | | Move error handlers from OC_Log to OC\Log\ErrorHandler
| * | | | Check if logger is set, also no need to return trueBart Visscher2013-07-081-3/+1
| | | | |
| * | | | Move error handlers from OC_Log to OC\Log\ErrorHandlerBart Visscher2013-07-053-30/+58
| |/ / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-15534-1055/+1055
| | | |
* | | | Merge pull request #3487 from owncloud/basic_auth_hackThomas Müller2013-07-141-7/+5
|\ \ \ \ | | | | | | | | | | Basic Auth is broken - again...
| * | | | Move comment and set requesttoken.Thomas Tanghus2013-06-051-3/+2
| | | | |
| * | | | Cleanup hacke v.2Thomas Tanghus2013-05-311-4/+2
| | | | |
| * | | | Revert "Clean up hack."Thomas Tanghus2013-05-312-3/+4
| | | | | | | | | | | | | | | | | | | | This reverts commit 138c7f615bef9994629d4aa283ae7f037dc0f14d.
| * | | | Clean up hack.Thomas Tanghus2013-05-312-4/+3
| | | | |
| * | | | Hack base.php to make Basic Auth workThomas Tanghus2013-05-251-1/+2
| | | | |
* | | | | Merge pull request #4061 from rolandgeider/masterJan-Christoph Borchardt2013-07-141-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Use transifex.com on link to translations
| * | | | | Use transifex.com on link to translationsrolandgeider2013-07-141-1/+1
|/ / / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-14541-1100/+1140
| | | | |
* | | | | Removed the preview warning. This is only a simple text changeFrank Karlitschek2013-07-131-1/+1
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-13539-2047/+2064
| | | | |
* | | | | Merge pull request #4037 from owncloud/add_new_file_above_summaryKondou2013-07-121-0/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | add new file above summary if it is the first file in the list
| * | | | add new file above summary if it is the first file in the listBjörn Schießle2013-07-121-0/+2
| | | | |
* | | | | fix array access and change variable names according to the coding styleBjörn Schießle2013-07-121-11/+13
| | | | |
* | | | | continue cleaning-up old versions if availableSpace=0. It's not necessary ↵Björn Schießle2013-07-121-1/+1
| | | | | | | | | | | | | | | | | | | | but gives us some additional free space, especially in the case of a hard quota
* | | | | fix some var names according to our style guideBjörn Schießle2013-07-121-7/+7
| | | | |
* | | | | adjust commentsBjörn Schießle2013-07-121-1/+1
| | | | |
* | | | | fix typo in commentBjörn Schießle2013-07-121-1/+1
| | | | |