aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* only add style.css to initsessionBernhard Posselt2013-02-271-1/+2
* add css and scripts before session initBernhard Posselt2013-02-271-1/+1
* Merge pull request #1920 from owncloud/catch_vcategories_exceptionsLukas Reschke2013-02-261-18/+34
|\
| * Catch exceptions on malformed categories.Thomas Tanghus2013-02-261-18/+34
* | Merge pull request #1922 from owncloud/missing_Thomas Müller2013-02-261-1/+1
|\ \
| * | Add missing echoLukas Reschke2013-02-261-1/+1
|/ /
* | Merge pull request #1915 from owncloud/fix_webdav_mountFrank Karlitschek2013-02-261-1/+1
|\ \
| * | cleanPath needs to be publicBjörn Schießle2013-02-261-1/+1
| |/
* | Merge pull request #1919 from owncloud/logo-pixelperfectFrank Karlitschek2013-02-265-814/+55
|\ \ | |/ |/|
| * remove more unused logo files, now in promoJan-Christoph Borchardt2013-02-263-764/+0
| * align logo type pixel perfectlyJan-Christoph Borchardt2013-02-262-50/+55
|/
* Merge pull request #1902 from owncloud/angularcspFrank Karlitschek2013-02-263-3/+3
|\
| * add CSP turned on for angularjsBernhard Posselt2013-02-253-3/+3
* | Merge pull request #1906 from owncloud/storage-stat-failBernhard Posselt2013-02-261-83/+116
|\ \
| * | Storage: don't throw warnings when a stat failsRobin Appelman2013-02-261-2/+10
| * | Code styleRobin Appelman2013-02-261-81/+106
* | | Merge pull request #1903 from owncloud/fix_version_checkBernhard Posselt2013-02-262-0/+10
|\ \ \
| * | | return true once one owncloud version number is bigger at any positionBernhard Posselt2013-02-252-0/+10
| | |/ | |/|
* | | Merge pull request #1885 from houqp/issue_1776Frank Karlitschek2013-02-262-2/+5
|\ \ \ | |_|/ |/| |
| * | remove GwrQingping Hou2013-02-251-116/+0
| * | use text method instead of html methodQingping Hou2013-02-251-0/+116
| * | Merge branch 'master' of github.com:owncloud/core into issue_1776Qingping Hou2013-02-2574-550/+1391
| |\ \
| * | | add span tag to displayname on expand buttonQingping Hou2013-02-252-4/+2
| * | | update oldDisplayName value on displayName changeQingping Hou2013-02-241-0/+1
| * | | when user changes displayName, also update it on expand buttonQingping Hou2013-02-241-1/+5
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-26105-2606/+5428
| |/ / |/| |
* | | Merge pull request #1898 from owncloud/session_start_fixLukas Reschke2013-02-251-2/+15
|\ \ \
| * | | use error templateBernhard Posselt2013-02-251-3/+9
| * | | added simple error message for the browserBernhard Posselt2013-02-251-0/+2
| * | | write an error log when session could not be initializedBernhard Posselt2013-02-251-0/+2
| * | | set http 500 when session could not be started to prevent serving of empty fi...Bernhard Posselt2013-02-251-2/+5
| | |/ | |/|
* | | Merge pull request #1837 from owncloud/fix-user-templateLukas Reschke2013-02-252-6/+1
|\ \ \
| * | | Remove unneeded code for user layout templateBart Visscher2013-02-222-6/+1
* | | | Merge pull request #1839 from owncloud/no_recursive_object_walkingLukas Reschke2013-02-251-2/+2
|\ \ \ \
| * | | | Don't walk objects with array_walk_recursive()Thomas Tanghus2013-02-221-2/+2
* | | | | Merge pull request #1706 from owncloud/master-sqlserverThomas Müller2013-02-258-50/+489
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into master-sqlserverThomas Mueller2013-02-22476-3781/+7569
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into master-sqlserverThomas Mueller2013-02-20100-741/+1250
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into master-sqlserverThomas Mueller2013-02-18250-1857/+4929
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into master-sqlserverThomas Mueller2013-02-14553-9626/+20103
| |\ \ \ \ \ \ \ \
| * | | | | | | | | final adoptions for mssql connectivityThomas Mueller2013-02-143-6/+19
| * | | | | | | | | fixing sql server syntax for database creationThomas Mueller2013-02-121-1/+1
| * | | | | | | | | write any database messages / non critical errors to the log - don't pollute ...Thomas Mueller2013-02-121-32/+33
| * | | | | | | | | fixing indentThomas Mueller2013-02-121-35/+35
| * | | | | | | | | fixing undefined variablesThomas Mueller2013-02-121-5/+7
| * | | | | | | | | Merge branch 'master' into master-sqlserverThomas Mueller2013-02-12971-13194/+53448
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | fixing user for autotesting mssqlThomas Mueller2013-02-111-1/+1
| * | | | | | | | | | Merge pull request #1635 from irgsmirx/master-sqlserverThomas Müller2013-02-116-16/+418
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | - Fixed indentations.Administrator2013-02-102-77/+83
| | * | | | | | | | | | Bugfixes and cleanup MS SQL Server installationAdministrator2013-02-105-87/+148