summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* [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
|\ | | | | add styles before session init
| * 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 inst...
| * | fixed bug that would cause a failure because of undefined variable instead ↵Bernhard Posselt2013-02-271-1/+1
| |/ | | | | | | of %s in a translation string
* | Merge pull request #1948 from owncloud/improve_user_sortingBernhard Posselt2013-02-271-1/+1
|\ \ | | | | | | Sort after display name + LDAP server side sorting
| * | 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
|/ | | | Fixes #1925
* 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
|\ | | | | Common storage: don't throw warning when a stat fails
| * 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 position
| * 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
|\ \ | | | | | | set http 500 when session could not be started to prevent serving of emp...
| * | 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 ↵Bernhard Posselt2013-02-251-2/+5
| |/ | | | | | | files see #1049
* | Merge pull request #1837 from owncloud/fix-user-templateLukas Reschke2013-02-251-5/+0
|\ \ | | | | | | Remove unneeded code for user layout template
| * | 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()
| * | | 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
|\ \ \ | | | | | | | | Microsoft SQL-Server support for ownCloud!
| * \ \ Merge branch 'master' into master-sqlserverThomas Mueller2013-02-229-29/+84
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: core/templates/installation.php
| * \ \ \ Merge branch 'master' into master-sqlserverThomas Mueller2013-02-209-21/+270
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/files/cache/cache.php
| * \ \ \ \ Merge branch 'master' into master-sqlserverThomas Mueller2013-02-1816-29/+112
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into master-sqlserverThomas Mueller2013-02-1477-453/+1143
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/db.php lib/files/cache/cache.php lib/files/cache/legacy.php lib/setup.php
| * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the browser
| * | | | | | | fixing indentThomas Mueller2013-02-121-35/+35
| | | | | | | |
| * | | | | | | fixing undefined variablesThomas Mueller2013-02-121-5/+7
| | | | | | | |
| * | | | | | | Merge branch 'master' into master-sqlserverThomas Mueller2013-02-1244-111/+1051
| |\ \ \ \ \ \ \
| * | | | | | | | - Fixed indentations.Administrator2013-02-102-77/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed a bug in legacy.php: there was an error that was not checked for if the table 'fscache' did not exist in the database.
| * | | | | | | | Bugfixes and cleanup MS SQL Server installationAdministrator2013-02-102-83/+144
| | | | | | | | |
| * | | | | | | | Added MS SQL Server supportTobias Ramforth2013-02-082-7/+321
| | | | | | | | |
* | | | | | | | | 5 beta 2v5.0.0beta2Frank Karlitschek2013-02-251-2/+2
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge pull request #1891 from owncloud/set_timeoutBernhard Posselt2013-02-251-1/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | use a 5 sec timeout for the webdav check
| * | | | | | | | use a 5 sec timeout for the webdav checkFrank Karlitschek2013-02-251-1/+9
| | | | | | | | |
* | | | | | | | | Merge pull request #1865 from owncloud/fix-displaying-db-errorsBjörn Schießle2013-02-252-3/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Don't use routes when displaying error page
| * | | | | | | | | Don't use routes when displaying error pageBart Visscher2013-02-222-3/+5
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #1887 from owncloud/fixing-1843-masterBart Visscher2013-02-251-13/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | remove the check for session data folder - causes trouble on some enviro...
| * | | | | | | | | remove the check for session data folder - causes trouble on some environmentsThomas Mueller2013-02-251-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | let's try to find another solution for =C6
* | | | | | | | | | created unittests and factored out version test into seperate methodBernhard Posselt2013-02-251-4/+32
| | | | | | | | | |
* | | | | | | | | | spaces to tabsBernhard Posselt2013-02-251-4/+4
| | | | | | | | | |
* | | | | | | | | | version checks for apps now use all three version numbers and fixed bug that ↵Bernhard Posselt2013-02-251-2/+4
| |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | would not do the version check correctly for the second version