summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6081 from owncloud/partfilewebdavfixVincent Petry2014-02-041-1/+14
|\
| * Allow getting info or renaming part files through WebDAVVincent Petry2014-01-231-1/+14
* | Merge pull request #4795 from owncloud/setupMorris Jobke2014-02-046-161/+162
|\ \
| * | Use === instead of ==, add missing whitespace and CSS classMorris Jobke2014-02-011-2/+2
| * | Remove unused functions from OC_HelperBart Visscher2014-01-311-23/+0
| * | DRY for database type radiolistBart Visscher2014-01-312-54/+25
| * | Do setup default value handling in the controller not the templateBart Visscher2014-01-312-9/+19
| * | Merge branch 'master' into setupBart Visscher2014-01-312203-76590/+170616
| |\ \
| * | | fix undefined $htaccessWorkingMorris Jobke2013-10-071-1/+1
| * | | Merge remote-tracking branch 'origin/master' into setupBart Visscher2013-10-021193-16046/+50329
| |\ \ \
| * | | | Copyright and small fixBart Visscher2013-10-021-1/+7
| * | | | fixing typo on $htaccessWorking - testing own code before pushing is appreciatedThomas Müller2013-09-241-1/+2
| * | | | Merge branch 'master' into setupBart Visscher2013-09-12142-664/+735
| |\ \ \ \
| * | | | | Check for failure in creating htaccessWorking testfileBart Visscher2013-09-102-6/+20
| * | | | | Move core setup code to controller classBart Visscher2013-09-103-60/+81
* | | | | | Merge pull request #6647 from owncloud/memcache-publicicewind19912014-02-048-29/+74
|\ \ \ \ \ \
| * | | | | | Fix some phpdoc errors and rename interfaceRobin Appelman2014-01-243-5/+9
| * | | | | | Merge branch 'master' into memcache-publicRobin Appelman2014-01-2256-239/+709
| |\ \ \ \ \ \
| * | | | | | | revert accidental 3rdparty commitRobin Appelman2014-01-221-0/+0
| * | | | | | | Merge branch 'master' into memcache-publicRobin Appelman2014-01-1561-3524/+354
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into memcache-publicRobin Appelman2014-01-0996-338/+4265
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Use $server->getMemCacheFactory() in ldap connectionRobin Appelman2014-01-092-1/+10
| * | | | | | | | | Also update the OCP\IServerContainerRobin Appelman2014-01-082-4/+4
| * | | | | | | | | get the memorycache factory from OCP\Server instead of a cache instanceRobin Appelman2014-01-082-6/+22
| * | | | | | | | | Remove the static dependency on OC_Util from MemcacheRobin Appelman2014-01-064-2/+23
| * | | | | | | | | Use APCIterator for Memcache\APC::clear()Robin Appelman2014-01-062-26/+8
| * | | | | | | | | expose memory cache in public apiRobin Appelman2014-01-061-0/+13
* | | | | | | | | | Merge pull request #7065 from owncloud/errorHandler_testsVincent Petry2014-02-042-1/+63
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | add test for password remove methodBjoern Schiessle2014-02-042-1/+63
* | | | | | | | | | | Merge pull request #7057 from owncloud/pictures-iconJan-Christoph Borchardt2014-02-032-4/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | better picture icon, fix https://github.com/owncloud/apps/issues/1401Jan-Christoph Borchardt2014-02-032-4/+1
* | | | | | | | | | | | Merge pull request #7055 from owncloud/ellipsize-modified-dateJan-Christoph Borchardt2014-02-031-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | fix misalignment of modified dates, shift to rightJan-Christoph Borchardt2014-02-031-0/+1
| * | | | | | | | | | | ellipsize long modified dates to make room for showing delete button, fix #7040Jan-Christoph Borchardt2014-02-031-0/+10
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #7014 from owncloud/fix_ocs_share_apiBjörn Schießle2014-02-031-2/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | remove needless element tagBjoern Schiessle2014-01-301-2/+1
* | | | | | | | | | | | Merge pull request #7013 from owncloud/dont_write_passwords_to_logBjörn Schießle2014-02-033-7/+28
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | also load error handler if debugging is enabledBjoern Schiessle2014-02-032-4/+17
| * | | | | | | | | | | remove passwords in URLs from all log messagesBjoern Schiessle2014-02-032-4/+12
* | | | | | | | | | | | Merge pull request #7025 from owncloud/prevent-double-app-loadicewind19912014-01-311-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Mark an app as loaded before we start loading itRobin Appelman2014-01-311-1/+1
* | | | | | | | | | | | | Merge pull request #7017 from owncloud/trashpreviewGeorg Ehrke2014-01-311-2/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fixed image preview in trashbin subdirsVincent Petry2014-01-301-2/+12
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #5151 from owncloud/file-actionsMorris Jobke2014-01-314-6/+35
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Makes Rename Icon Width 44px for touch sourfaces.raghunayyar2014-01-311-0/+5
| * | | | | | | | | | | Updated unit tests for rename actionVincent Petry2014-01-301-1/+12
| * | | | | | | | | | | Rename action now appears as pencil iconraghunayyar2014-01-303-5/+18
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #6278 from nickvergessen/issue/6263Raghu Nayyar2014-01-292-15/+20
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | Add alt attribute for img elementsJoas Schilling2014-01-101-3/+3
| * | | | | | | | | | Extend margin to avoid displaying a scrollbarJoas Schilling2014-01-101-1/+1