Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-27 | 11 | -10/+15 |
| | |||||
* | Merge pull request #1956 from owncloud/session-error-format | Bart Visscher | 2013-02-27 | 1 | -0/+1 |
|\ | | | | | add styles before session init | ||||
| * | only add style.css to initsession | Bernhard Posselt | 2013-02-27 | 1 | -1/+2 |
| | | |||||
| * | add css and scripts before session init | Bernhard Posselt | 2013-02-27 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1961 from owncloud/trans_fix | Bart Visscher | 2013-02-27 | 1 | -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 Posselt | 2013-02-27 | 1 | -1/+1 |
| |/ | | | | | | | of %s in a translation string | ||||
* | | Merge pull request #1948 from owncloud/improve_user_sorting | Bernhard Posselt | 2013-02-27 | 1 | -1/+1 |
|\ \ | | | | | | | Sort after display name + LDAP server side sorting | ||||
| * | | sort users according to display name | Arthur Schiwon | 2013-02-26 | 1 | -1/+1 |
| |/ | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-27 | 11 | -1/+23 |
| | | |||||
* | | Fix using wrong quotes for breaking long lines | Bart Visscher | 2013-02-26 | 5 | -20/+20 |
|/ | | | | Fixes #1925 | ||||
* | Catch exceptions on malformed categories. | Thomas Tanghus | 2013-02-26 | 1 | -18/+34 |
| | |||||
* | Merge pull request #1906 from owncloud/storage-stat-fail | Bernhard Posselt | 2013-02-26 | 1 | -83/+116 |
|\ | | | | | Common storage: don't throw warning when a stat fails | ||||
| * | Storage: don't throw warnings when a stat fails | Robin Appelman | 2013-02-26 | 1 | -2/+10 |
| | | |||||
| * | Code style | Robin Appelman | 2013-02-26 | 1 | -81/+106 |
| | | |||||
* | | Merge pull request #1903 from owncloud/fix_version_check | Bernhard Posselt | 2013-02-26 | 1 | -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 position | Bernhard Posselt | 2013-02-25 | 1 | -0/+2 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-26 | 2 | -0/+38 |
| | | |||||
* | | Merge pull request #1898 from owncloud/session_start_fix | Lukas Reschke | 2013-02-25 | 1 | -2/+15 |
|\ \ | | | | | | | set http 500 when session could not be started to prevent serving of emp... | ||||
| * | | use error template | Bernhard Posselt | 2013-02-25 | 1 | -3/+9 |
| | | | |||||
| * | | added simple error message for the browser | Bernhard Posselt | 2013-02-25 | 1 | -0/+2 |
| | | | |||||
| * | | write an error log when session could not be initialized | Bernhard Posselt | 2013-02-25 | 1 | -0/+2 |
| | | | |||||
| * | | set http 500 when session could not be started to prevent serving of empty ↵ | Bernhard Posselt | 2013-02-25 | 1 | -2/+5 |
| |/ | | | | | | | files see #1049 | ||||
* | | Merge pull request #1837 from owncloud/fix-user-template | Lukas Reschke | 2013-02-25 | 1 | -5/+0 |
|\ \ | | | | | | | Remove unneeded code for user layout template | ||||
| * | | Remove unneeded code for user layout template | Bart Visscher | 2013-02-22 | 1 | -5/+0 |
| | | | |||||
* | | | Merge pull request #1839 from owncloud/no_recursive_object_walking | Lukas Reschke | 2013-02-25 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Don't walk objects with array_walk_recursive() | ||||
| * | | | Don't walk objects with array_walk_recursive() | Thomas Tanghus | 2013-02-22 | 1 | -2/+2 |
| |/ / | |||||
* | | | Merge pull request #1706 from owncloud/master-sqlserver | Thomas Müller | 2013-02-25 | 3 | -33/+418 |
|\ \ \ | | | | | | | | | Microsoft SQL-Server support for ownCloud! | ||||
| * \ \ | Merge branch 'master' into master-sqlserver | Thomas Mueller | 2013-02-22 | 9 | -29/+84 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: core/templates/installation.php | ||||
| * \ \ \ | Merge branch 'master' into master-sqlserver | Thomas Mueller | 2013-02-20 | 9 | -21/+270 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/files/cache/cache.php | ||||
| * \ \ \ \ | Merge branch 'master' into master-sqlserver | Thomas Mueller | 2013-02-18 | 16 | -29/+112 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into master-sqlserver | Thomas Mueller | 2013-02-14 | 77 | -453/+1143 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/db.php lib/files/cache/cache.php lib/files/cache/legacy.php lib/setup.php | ||||
| * | | | | | | | final adoptions for mssql connectivity | Thomas Mueller | 2013-02-14 | 2 | -3/+10 |
| | | | | | | | | |||||
| * | | | | | | | fixing sql server syntax for database creation | Thomas Mueller | 2013-02-12 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | write any database messages / non critical errors to the log - don't pollute ↵ | Thomas Mueller | 2013-02-12 | 1 | -32/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the browser | ||||
| * | | | | | | | fixing indent | Thomas Mueller | 2013-02-12 | 1 | -35/+35 |
| | | | | | | | | |||||
| * | | | | | | | fixing undefined variables | Thomas Mueller | 2013-02-12 | 1 | -5/+7 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into master-sqlserver | Thomas Mueller | 2013-02-12 | 44 | -111/+1051 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | - Fixed indentations. | Administrator | 2013-02-10 | 2 | -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 installation | Administrator | 2013-02-10 | 2 | -83/+144 |
| | | | | | | | | | |||||
| * | | | | | | | | Added MS SQL Server support | Tobias Ramforth | 2013-02-08 | 2 | -7/+321 |
| | | | | | | | | | |||||
* | | | | | | | | | 5 beta 2v5.0.0beta2 | Frank Karlitschek | 2013-02-25 | 1 | -2/+2 |
| |_|_|_|_|_|_|/ |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #1891 from owncloud/set_timeout | Bernhard Posselt | 2013-02-25 | 1 | -1/+9 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | use a 5 sec timeout for the webdav check | ||||
| * | | | | | | | | use a 5 sec timeout for the webdav check | Frank Karlitschek | 2013-02-25 | 1 | -1/+9 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #1865 from owncloud/fix-displaying-db-errors | Björn Schießle | 2013-02-25 | 2 | -3/+5 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Don't use routes when displaying error page | ||||
| * | | | | | | | | | Don't use routes when displaying error page | Bart Visscher | 2013-02-22 | 2 | -3/+5 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #1887 from owncloud/fixing-1843-master | Bart Visscher | 2013-02-25 | 1 | -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 environments | Thomas Mueller | 2013-02-25 | 1 | -13/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | let's try to find another solution for =C6 | ||||
* | | | | | | | | | | created unittests and factored out version test into seperate method | Bernhard Posselt | 2013-02-25 | 1 | -4/+32 |
| | | | | | | | | | | |||||
* | | | | | | | | | | spaces to tabs | Bernhard Posselt | 2013-02-25 | 1 | -4/+4 |
| | | | | | | | | | | |||||
* | | | | | | | | | | version checks for apps now use all three version numbers and fixed bug that ↵ | Bernhard Posselt | 2013-02-25 | 1 | -2/+4 |
| |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | would not do the version check correctly for the second version |