aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-06-02545-1093/+1118
* Merge pull request #3573 from owncloud/octemplate_speedupKondou2013-06-011-4/+4
|\
| * Forgot typeof conditionThomas Tanghus2013-06-011-1/+3
| * Speed up octemplate rendering.Thomas Tanghus2013-06-011-5/+3
* | Merge pull request #3454 from owncloud/fix_hasInternetConnectionThomas Müller2013-05-312-6/+12
|\ \
| * | fix method namingThomas Mueller2013-05-312-4/+4
| * | use false instead of 0Georg Ehrke2013-05-271-1/+1
| * | make method names camelCaseGeorg Ehrke2013-05-272-4/+4
| * | update commentGeorg Ehrke2013-05-271-1/+1
| * | don't show a warning if internet connection is disabled on purposeGeorg Ehrke2013-05-271-1/+1
| * | move check if internet connection is disabled on purpose to a dedicated methodGeorg Ehrke2013-05-271-2/+8
| * | fix return value of OC_Util::isinternetconnectionworking()Georg Ehrke2013-05-221-1/+1
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-01552-1105/+1133
* | | Merge pull request #3459 from owncloud/fix_for_2377icewind19912013-05-316-4/+148
|\ \ \
| * \ \ Merge branch 'master' into fix_for_2377Florin Peter2013-05-25939-4924/+10566
| |\ \ \
| * | | | improved tests to check if database layer normalize folder namesFlorin Peter2013-05-251-11/+29
| * | | | we should also normalize on update and search because the database layer will...Florin Peter2013-05-251-0/+15
| * | | | added more places where normalization is neededFlorin Peter2013-05-251-0/+7
| * | | | prevent for returning while false normalize stringFlorin Peter2013-05-251-1/+6
| * | | | submodule 3rdparty updatedThomas Mueller2013-05-241-0/+0
| * | | | Merge branch 'master' into fix_for_2377Florin Peter2013-05-24733-6873/+12278
| |\ \ \ \
| * | | | | changed tests for using new normalizerFlorin Peter2013-05-242-3/+3
| * | | | | changed builtin normalizer to \OC_Util::normalizeUnicodeFlorin Peter2013-05-242-9/+3
| * | | | | added normalizeUnicode() method to OC_UtilFlorin Peter2013-05-241-0/+14
| * | | | | revert previous fix and added normalizer to cache classFlorin Peter2013-05-233-1/+92
| * | | | | fix problems with german "Umlaut" in folder nameFlorin Peter2013-05-231-1/+1
* | | | | | Merge pull request #3565 from owncloud/fix_ldap_sqlite_n_jsblizzz2013-05-312-2/+8
|\ \ \ \ \ \
| * | | | | | LDAP: sqlite compatibility for emptyiing tablesArthur Schiwon2013-05-311-1/+7
| * | | | | | LDAP: fix setting value of checkbox after loading configurationArthur Schiwon2013-05-311-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #3562 from owncloud/fix_ldap_offline_host_handlingblizzz2013-05-311-3/+9
|\ \ \ \ \ \
| * | | | | | LDAP: fix possible recursionArthur Schiwon2013-05-251-0/+7
| * | | | | | LDAP: fix handling when LDAP Host is offlineArthur Schiwon2013-05-251-3/+2
* | | | | | | Merge pull request #3554 from owncloud/files_encryption_fs_loaded_fixFlorinPeter2013-05-312-0/+11
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | also fix login errors while filesystem is not loaded in app.phpFlorin Peter2013-05-311-0/+6
| * | | | | | Merge branch 'master' into files_encryption_fs_loaded_fixFlorin Peter2013-05-318-177/+194
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #3527 from owncloud/file_encryption_external_storage_fixesFlorinPeter2013-05-318-177/+194
|\ \ \ \ \ \ \
| * | | | | | | added our own file extension .part will not work here if we use file_get_cont...Florin Peter2013-05-302-5/+5
| * | | | | | | prevent files_versions from calling file proxy which calls files_encryption a...Florin Peter2013-05-301-0/+17
| * | | | | | | fix share and un-share for single fileFlorin Peter2013-05-301-23/+13
| * | | | | | | fixed problems with file_get_contents and file_put_contents this problem was ...Florin Peter2013-05-303-127/+92
| * | | | | | | Merge branch 'master' into file_encryption_external_storage_fixesFlorin Peter2013-05-3018-725/+767
| |\ \ \ \ \ \ \
| * | | | | | | | fixes for pgsqlFlorin Peter2013-05-291-4/+4
| * | | | | | | | changed deprecated classFlorin Peter2013-05-291-1/+1
| * | | | | | | | fixed typoFlorin Peter2013-05-291-1/+1
| * | | | | | | | fixes if cache returns falseFlorin Peter2013-05-291-6/+16
| * | | | | | | | fix $parent/$source typoFlorin Peter2013-05-291-2/+1
| * | | | | | | | Merge branch 'master' into file_encryption_external_storage_fixesFlorin Peter2013-05-29573-2123/+2248
| |\ \ \ \ \ \ \ \
| * | | | | | | | | fix for share folder on external storageFlorin Peter2013-05-292-2/+33
| * | | | | | | | | fix indentionBjörn Schießle2013-05-291-5/+5
| * | | | | | | | | remove unnecessary variableBjörn Schießle2013-05-291-2/+1