summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* save current work state of office fallbackGeorg Ehrke2013-06-112-26/+81
* check if imagick is loaded in office.php, not in libreoffice-cl.phpGeorg Ehrke2013-06-112-53/+51
* code optimizationGeorg Ehrke2013-06-116-19/+7
* don't crop Y axisGeorg Ehrke2013-06-111-1/+2
* implement previews for single shared filesGeorg Ehrke2013-06-101-15/+24
* Merge branch 'master' into oc_previewGeorg Ehrke2013-06-10559-1146/+1181
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2013-06-10529-1045/+1045
| * [tx-robot] updated from transifexJenkins for ownCloud2013-06-09521-1040/+1040
| * [tx-robot] updated from transifexJenkins for ownCloud2013-06-08557-1151/+1184
| * Merge pull request #2919 from owncloud/hook-improvementsMichael Gapczynski2013-06-071-6/+8
| |\
| | * Merge branch 'master' into hook-improvementsMichael Gapczynski2013-06-041691-65985/+65795
| | |\
| | * | Don't unlink old renamed file if stream copy failedMichael Gapczynski2013-04-131-1/+3
| | * | Check if operation worked before sending post hooks, fixes #2484Michael Gapczynski2013-04-131-4/+4
| * | | Merge pull request #3628 from owncloud/update_3rdparty_submoduleMorris Jobke2013-06-071-0/+0
| |\ \ \
| | * | | update 3rdparty submoduleGeorg Ehrke2013-06-071-0/+0
| |/ / /
* | | | Merge branch 'master' into oc_previewGeorg Ehrke2013-06-07127-651/+1131
|\| | |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-0753-222/+372
| * | | Merge pull request #3622 from owncloud/read-extfx-confg-from-homeThomas Müller2013-06-061-0/+9
| |\ \ \
| | * | | Read configuratons for external filesystem test from a private place.Thomas Mueller2013-06-071-0/+9
| |/ / /
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-0637-115/+176
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-0562-341/+598
| | |/ | |/|
| * | Merge pull request #3594 from opensaucesystems/patch-1Thomas Müller2013-06-041-3/+4
| |\ \
| | * | Added input[type="url"] to styles.cssopensaucesystems2013-06-041-3/+4
| * | | exclude 3rdparty folder within files_external and files_encryption from code ...Thomas Mueller2013-06-041-0/+2
| |/ /
* | | Merge branch 'master' into oc_previewGeorg Ehrke2013-06-06729-3860/+7225
|\| |
| * | LDAP: append port when URL is passed in LDAP Host configuration, fixes #2600Arthur Schiwon2013-06-041-0/+4
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-06-04148-632/+636
| * | ignore l10n folder within remaining appsThomas Mueller2013-06-041-0/+8
| * | Cache Test: set datadir to temporary location, otherwise initmountpoints will...Arthur Schiwon2013-06-031-2/+8
| * | Cache: mount user mountpoints to make sure that // exists before accessing it...Arthur Schiwon2013-06-031-0/+1
| * | Merge pull request #3444 from owncloud/share-fixJörn Friedrich Dreyer2013-06-031-1/+1
| |\ \
| | * | Fix undefined index for share mount point retrievalMichael Gapczynski2013-05-211-1/+1
| * | | Merge pull request #3581 from owncloud/publicphp_maintenanceJörn Friedrich Dreyer2013-06-031-0/+1
| |\ \ \
| | * | | public.php - check if maintenance mode is enabledGeorg Ehrke2013-06-031-0/+1
| * | | | Merge pull request #3561 from owncloud/usericewind19912013-06-0313-412/+1893
| |\ \ \ \
| | * | | | also clear cached users when removing a single backendRobin Appelman2013-06-031-0/+1
| | * | | | use caching for userExistsRobin Appelman2013-06-031-6/+3
| | * | | | cast result to boolRobin Appelman2013-06-031-1/+2
| | * | | | move phpdoc commentsRobin Appelman2013-06-033-2/+52
| | * | | | User: return backend resultRobin Appelman2013-06-031-2/+1
| | * | | | User: consisten variable namingRobin Appelman2013-06-031-9/+9
| | * | | | User: remove determineDisplayNameRobin Appelman2013-06-031-19/+9
| | * | | | adding PHPDoc comment to getManager()Thomas Mueller2013-06-011-1/+10
| | * | | | fix namespacing errorRobin Appelman2013-06-011-3/+3
| | * | | | fix undefined variablesRobin Appelman2013-06-011-2/+2
| | * | | | use single quotesRobin Appelman2013-06-011-10/+10
| | * | | | user should set into session before postLogin hook otherwise it will break no...Florin Peter2013-05-311-1/+1
| | * | | | fix broken testsFlorin Peter2013-05-311-1/+1
| | * | | | Fix postLogin hookRobin Appelman2013-05-312-2/+2
| | * | | | fix typoRobin Appelman2013-05-311-1/+1