Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | generate url only once | Bernhard Posselt | 2013-02-26 | 1 | -1/+1 |
| | |||||
* | use 15 min instead of 15 sec timeout | Bernhard Posselt | 2013-02-26 | 1 | -1/+1 |
| | |||||
* | implemented a heartbeat request which is calls the server every 15 minutes ↵ | Bernhard Posselt | 2013-02-26 | 2 | -0/+20 |
| | | | | to prevent a session timeout | ||||
* | 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 | 2 | -0/+10 |
|\ \ | | | | | | | 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 | 2 | -0/+10 |
| | | | |||||
* | | | Merge pull request #1885 from houqp/issue_1776 | Frank Karlitschek | 2013-02-26 | 2 | -2/+5 |
|\ \ \ | |_|/ |/| | | when user changes displayName, also update it on expand button | ||||
| * | | remove Gwr | Qingping Hou | 2013-02-25 | 1 | -116/+0 |
| | | | |||||
| * | | use text method instead of html method | Qingping Hou | 2013-02-25 | 1 | -0/+116 |
| | | | |||||
| * | | Merge branch 'master' of github.com:owncloud/core into issue_1776 | Qingping Hou | 2013-02-25 | 74 | -550/+1391 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: core/templates/layout.user.php | ||||
| * | | | add span tag to displayname on expand button | Qingping Hou | 2013-02-25 | 2 | -4/+2 |
| | | | | |||||
| * | | | update oldDisplayName value on displayName change | Qingping Hou | 2013-02-24 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a bug that can be reproduced in following way: 1. change displayName 2. clear text in displayName input click change again Then you will get an error and previous displayName will be restored. Expected behavior should restore the new updated displayName. | ||||
| * | | | when user changes displayName, also update it on expand button | Qingping Hou | 2013-02-24 | 1 | -1/+5 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-26 | 105 | -2606/+5428 |
| |/ / |/| | | |||||
* | | | 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 | 2 | -6/+1 |
|\ \ \ | | | | | | | | | Remove unneeded code for user layout template | ||||
| * | | | Remove unneeded code for user layout template | Bart Visscher | 2013-02-22 | 2 | -6/+1 |
| | | | | |||||
* | | | | 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 | 8 | -50/+489 |
|\ \ \ \ \ | | | | | | | | | | | | | Microsoft SQL-Server support for ownCloud! | ||||
| * \ \ \ \ | Merge branch 'master' into master-sqlserver | Thomas Mueller | 2013-02-22 | 476 | -3781/+7569 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/templates/installation.php | ||||
| * \ \ \ \ \ | Merge branch 'master' into master-sqlserver | Thomas Mueller | 2013-02-20 | 100 | -741/+1250 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/files/cache/cache.php | ||||
| * \ \ \ \ \ \ | Merge branch 'master' into master-sqlserver | Thomas Mueller | 2013-02-18 | 250 | -1857/+4929 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into master-sqlserver | Thomas Mueller | 2013-02-14 | 553 | -9626/+20103 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -6/+19 |
| | | | | | | | | | | |||||
| * | | | | | | | | | 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 | 971 | -13194/+53448 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | fixing user for autotesting mssql | Thomas Mueller | 2013-02-11 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #1635 from irgsmirx/master-sqlserver | Thomas Müller | 2013-02-11 | 6 | -16/+418 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | New/rebased/cleaned-up MS SQL Server support | ||||
| | * | | | | | | | | | | - 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 | 5 | -87/+148 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Added MS SQL Server support | Tobias Ramforth | 2013-02-08 | 5 | -11/+346 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | adding autotesting for mssql server - windows only | Thomas Mueller | 2013-02-07 | 1 | -10/+37 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | 5 beta 2v5.0.0beta2 | Frank Karlitschek | 2013-02-25 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #1894 from owncloud/texfix | Frank Karlitschek | 2013-02-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | fixed bug that prevented a newly created file to be opened with register... | ||||
| * | | | | | | | | | | fixed bug that prevented a newly created file to be opened with registered ↵ | Bernhard Posselt | 2013-02-25 | 1 | -1/+1 |
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files actions | ||||
* | | | | | | | | | | 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 #1864 from owncloud/fix_display_default | Frank Karlitschek | 2013-02-25 | 1 | -7/+4 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | LDAP: simplify default for user home settings, fixes wrong display of de... | ||||
| * | | | | | | | | | | | LDAP: simplify default for user home settings, fixes wrong display of ↵ | Arthur Schiwon | 2013-02-22 | 1 | -7/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default value in settings | ||||
* | | | | | | | | | | | | Merge pull request #1890 from owncloud/trashbin_fix | Björn Schießle | 2013-02-25 | 2 | -10/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | fix quota calculation for trash bin and versions |