summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1972 from owncloud/raw-pathinfoBernhard Posselt2013-02-272-2/+15
|\
| * Use the plain urlencoded path info for the routing matchingBart Visscher2013-02-272-2/+15
* | Disable query cache for SqliteBart Visscher2013-02-271-1/+4
* | Merge pull request #1944 from owncloud/query-caching-upgradeBernhard Posselt2013-02-271-2/+13
|\ \
| * | Disable prepared query caching while doing an upgradeRobin Appelman2013-02-261-2/+13
* | | Merge pull request #1031 from owncloud/external_storage_ui_feedbackMichael Gapczynski2013-02-271-0/+7
|\ \ \
| * \ \ Merge branch 'master' into external_storage_ui_feedbackMichael Gapczynski2013-02-2532-219/+706
| |\ \ \
| * \ \ \ Merge branch 'master' into external_storage_ui_feedbackMichael Gapczynski2013-02-1980-485/+1406
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into external_storage_ui_feedbackThomas Mueller2013-02-128-13/+113
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into external_storage_ui_feedbackThomas Mueller2013-02-128-0/+123
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into external_storage_ui_feedbackMichael Gapczynski2013-02-11131-3917/+6905
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into external_storage_ui_feedbackMichael Gapczynski2013-01-0932-907/+1095
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Move storage backend tests from constructor to test functionMichael Gapczynski2012-12-282-0/+9
* | | | | | | | | | Merge pull request #1962 from owncloud/big_upload_fixBernhard Posselt2013-02-271-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | timeout after a longer timeBernhard Posselt2013-02-271-2/+2
* | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-2711-10/+15
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #1956 from owncloud/session-error-formatBart Visscher2013-02-271-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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 #1961 from owncloud/trans_fixBart Visscher2013-02-271-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fixed bug that would cause a failure because of undefined variable instead o...Bernhard Posselt2013-02-271-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #1948 from owncloud/improve_user_sortingBernhard Posselt2013-02-271-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | sort users according to display nameArthur Schiwon2013-02-261-1/+1
| |/ / / / / / / / /
* | | | | | | | | / [tx-robot] updated from transifexJenkins for ownCloud2013-02-2711-1/+23
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Fix using wrong quotes for breaking long linesBart Visscher2013-02-265-20/+20
|/ / / / / / / /
* | | | | | | | Catch exceptions on malformed categories.Thomas Tanghus2013-02-261-18/+34
* | | | | | | | 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-261-0/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | return true once one owncloud version number is bigger at any positionBernhard Posselt2013-02-251-0/+2
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-262-0/+38
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | 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-251-5/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove unneeded code for user layout templateBart Visscher2013-02-221-5/+0
* | | | | | | | | 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-253-33/+418
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into master-sqlserverThomas Mueller2013-02-229-29/+84
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into master-sqlserverThomas Mueller2013-02-209-21/+270
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'master' into master-sqlserverThomas Mueller2013-02-1816-29/+112
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into master-sqlserverThomas Mueller2013-02-1477-453/+1143
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | final adoptions for mssql connectivityThomas Mueller2013-02-142-3/+10
| * | | | | | | | | | | | 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