summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #716 from eMerzh/remove_sqlite2Thomas Müller2012-12-051-1/+1
|\
| * Simplify has sqlite testBrice Maron2012-12-041-1/+1
| * Remove support of sqlite2 at installationBrice Maron2012-12-041-1/+1
* | Merge pull request #647 from owncloud/fix_app_settings_navigationThomas Müller2012-12-052-1/+2
|\ \
| * | Move loading of all the apps to setting the active navigation entry.Bart Visscher2012-11-302-1/+2
* | | Merge pull request #700 from eMerzh/fix_error_displayThomas Müller2012-12-051-14/+10
|\ \ \
| * | | Fix a dirty function preventing showing errorsBrice Maron2012-12-031-14/+10
* | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-0532-209/+301
* | | | Enabling unit testing for apptemplate_advancedThomas Müller2012-12-041-0/+1
| |_|/ |/| |
* | | Merge pull request #707 from owncloud/fix_infield_autofillJan-Christoph Borchardt2012-12-043-13/+165
|\ \ \
| * | | minified version no longer availableThomas Mueller2012-12-041-1/+1
| * | | merge changes discussed in dcneiner pull number 4 'fix for autocomplete issue...Jörn Friedrich Dreyer2012-12-041-5/+16
| * | | replace minified infieldlabel with dcneiners versionJörn Friedrich Dreyer2012-12-042-12/+153
|/ / /
* / / [tx-robot] updated from transifexJenkins for ownCloud2012-12-0432-55/+70
|/ /
* | LDAP: ldap_explode_dn escaped too much, fix it by manual replacement. Fixes d...Arthur Schiwon2012-12-031-4/+11
* | Merge pull request #650 from schiesbn/fix_fileVersioningForSharedFiles_masterBjörn Schießle2012-12-031-6/+6
|\ \
| * \ rebase on latest masterBjörn Schießle2012-12-020-0/+0
| |\ \
| | * | fix regression in file versioning for shared filesBjörn Schießle2012-11-301-6/+6
| * | | fix typo in variable nameBjörn Schießle2012-12-021-1/+1
| * | | fix regression in file versioning for shared filesBjörn Schießle2012-12-021-6/+6
* | | | Merge pull request #682 from VicDeo/masterThomas Müller2012-12-032-33/+28
|\ \ \ \
| * | | | Check if we have an array with data. Fix #487Victor Dubiniuk2012-12-021-1/+1
| * | | | Clean KB entries processing codeVictor Dubiniuk2012-12-021-32/+27
| |/ / /
* / / / [tx-robot] updated from transifexJenkins for ownCloud2012-12-0392-215/+254
|/ / /
* | | Merge pull request #654 from butonic/checkstyle_fixesThomas Müller2012-12-0230-370/+603
|\ \ \
| * | | fix checkstyle for files_external app, add whitespace for readabilityJörn Friedrich Dreyer2012-11-3022-306/+527
| * | | fix checkstyle for files_encryption app, add whitespace for readabilityJörn Friedrich Dreyer2012-11-308-64/+76
* | | | Merge pull request #672 from irosenb/patch-1icewind19912012-12-011-1/+1
|\ \ \ \
| * | | | Update lib/image.phpIsaac Rosenberg2012-12-011-1/+1
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-0256-483/+653
* | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-01144-2399/+2119
* | | | Merge pull request #603 from owncloud/store_plain_groupnameBart Visscher2012-11-302-2/+2
|\ \ \ \
| * | | | Group name does't need to be sanitized before storing it in the databaseBart Visscher2012-11-272-2/+2
* | | | | Merge pull request #644 from butonic/checkstyle_fixesBart Visscher2012-11-3010-73/+152
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | fix checkstyle for files appJörn Friedrich Dreyer2012-11-2911-74/+153
* | | | | Merge pull request #605 from owncloud/fix_false_positive_share_2Bart Visscher2012-11-301-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Sharing: Fix false positived v. 2Thomas Tanghus2012-11-271-1/+1
* | | | | Merge pull request #619 from samtuke/versions_cacheBart Visscher2012-11-302-5/+31
|\ \ \ \ \
| * | | | | OC_FSV->copy now only caches files which are copied from data/user/filesSam Tuke2012-11-282-5/+31
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-3081-394/+651
* | | | | | Merge pull request #635 from owncloud/ob_endThomas Müller2012-11-296-8/+17
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | use new obEnd function instead of ob_end_cleanRobin Appelman2012-11-295-5/+5
| * | | | | add function to safely end output bufferingRobin Appelman2012-11-291-3/+12
|/ / / / /
* | | | | Merge pull request #620 from owncloud/fix_600Georg Ehrke2012-11-292-7/+8
|\ \ \ \ \
| * | | | | use attr instead of dataGeorg Ehrke2012-11-291-7/+2
| * | | | | Revert "fix group and subadmin managing for 'ajax-loaded' users"Georg Ehrke2012-11-291-2/+7
| * | | | | add a client side checkGeorg Ehrke2012-11-281-0/+3
| * | | | | fix group and subadmin managing for 'ajax-loaded' usersGeorg Ehrke2012-11-281-7/+2
| * | | | | make some checks server-sideGeorg Ehrke2012-11-282-3/+6
| |/ / / /
* | | | | Merge pull request #617 from samtuke/fix_docblocksblizzz2012-11-291-21/+15
|\ \ \ \ \