summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-2381-834/+1395
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2012-10-2375-823/+1381
| * LDAP: fix db update for PostgresArthur Schiwon2012-10-232-2/+2
| * Disable enhancedauth by defaultLukas Reschke2012-10-222-4/+4
| * LDAP: fix cache save and check, fixes oc-2118Arthur Schiwon2012-10-221-4/+5
| * Fixing undefined $languageThomas Müller2012-10-221-1/+3
* | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-22139-837/+2880
|\|
| * add parameter to specify user for which OC_Filesystem should be initialized.Björn Schießle2012-10-222-3/+6
| * [tx-robot] updated from transifexJenkins for ownCloud2012-10-2230-145/+1810
| * [tx-robot] updated from transifexJenkins for ownCloud2012-10-2133-179/+303
| * Check for file exists before loading app version fileBart Visscher2012-10-201-3/+2
| * Fix font family for textareaMichael Gapczynski2012-10-201-1/+1
| * Apply textbox CSS rules to textarea as wellMichael Gapczynski2012-10-201-2/+3
| * [tx-robot] updated from transifexJenkins for ownCloud2012-10-2092-524/+775
* | Added missing backtick to sql query.Thomas Tanghus2012-10-221-1/+1
* | Added type and callback arguments to most methods.Thomas Tanghus2012-10-221-46/+95
* | Fix accidentally creating new categories with the id as name.Thomas Tanghus2012-10-201-6/+9
* | Filter out special Favorites category.Thomas Tanghus2012-10-201-5/+14
* | Clean indentation.Thomas Tanghus2012-10-191-120/+120
* | Remove redundant class wrapping.Thomas Tanghus2012-10-191-1/+0
* | Remove index that might cause problems.Thomas Tanghus2012-10-191-17/+0
* | Use self::prepare() instead of self::$connection->prepare.Thomas Tanghus2012-10-191-1/+1
* | Removed useless ORDER BY from query.Thomas Tanghus2012-10-191-1/+1
* | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-191-0/+7
|\|
| * Filter added to get all files into coderage reportThomas Müller2012-10-191-0/+7
* | Renamed OC_VCategories::add() to addMulti() and let the add() method return t...Thomas Tanghus2012-10-191-4/+28
* | Return result from OC_DB::insertIfNotExist().Thomas Tanghus2012-10-191-1/+1
* | Added unit tests for OC_DB::insertIfNotExist()Thomas Tanghus2012-10-192-0/+110
* | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-19129-1995/+2122
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2012-10-19129-1995/+2122
* | Make categories var static.Thomas Tanghus2012-10-191-27/+29
* | Add wait state to category dialog while processing.Thomas Tanghus2012-10-191-11/+39
* | app !== typeThomas Tanghus2012-10-191-1/+0
* | More js updates for app/type in OCCategoriesThomas Tanghus2012-10-191-11/+11
* | Use get for loading dialog.Thomas Tanghus2012-10-191-1/+1
* | White space fix.Thomas Tanghus2012-10-191-69/+69
* | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-19234-4855/+3893
|\|
| * cleanup report folderThomas Mueller2012-10-181-3/+3
| * adding coverage htmlThomas Mueller2012-10-181-3/+4
| * Fixing typoThomas Müller2012-10-181-1/+1
| * Fixing expectation - comma was stupid anyhowThomas Müller2012-10-181-1/+1
| * Removing strange characterThomas Müller2012-10-181-1/+1
| * unset UserID after UpdateArthur Schiwon2012-10-181-0/+1
| * Expectation should be first parameterLukas Reschke2012-10-181-6/+6
| * Expectation should be first parameterLukas Reschke2012-10-181-2/+2
| * check if mount point was already loaded to avoid redundant read operationsBjörn Schießle2012-10-181-1/+8
| * typo from previous commit fixedBjörn Schießle2012-10-181-1/+1
| * load system wide configured mount points before accessing shared filesBjörn Schießle2012-10-182-48/+57
| * check for mount points if file was shared from a different userBjörn Schießle2012-10-182-15/+28
| * Merge pull request #39 from scambra/date-l10n-fixesThomas Müller2012-10-186-14/+26
| |\