summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* generate url only onceBernhard Posselt2013-02-261-1/+1
|
* use 15 min instead of 15 sec timeoutBernhard Posselt2013-02-261-1/+1
|
* implemented a heartbeat request which is calls the server every 15 minutes ↵Bernhard Posselt2013-02-262-0/+20
| | | | to prevent a session timeout
* 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-262-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 positionBernhard Posselt2013-02-252-0/+10
| | |
* | | Merge pull request #1885 from houqp/issue_1776Frank Karlitschek2013-02-262-2/+5
|\ \ \ | |_|/ |/| | when user changes displayName, also update it on expand button
| * | 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
| |\ \ | | | | | | | | | | | | | | | | Conflicts: core/templates/layout.user.php
| * | | add span tag to displayname on expand buttonQingping Hou2013-02-252-4/+2
| | | |
| * | | update oldDisplayName value on displayName changeQingping Hou2013-02-241-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 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
|\ \ \ | | | | | | | | 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-252-6/+1
|\ \ \ | | | | | | | | Remove unneeded code for user layout template
| * | | 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()
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | Microsoft SQL-Server support for ownCloud!
| * \ \ \ \ Merge branch 'master' into master-sqlserverThomas Mueller2013-02-22476-3781/+7569
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/templates/installation.php
| * \ \ \ \ \ Merge branch 'master' into master-sqlserverThomas Mueller2013-02-20100-741/+1250
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/files/cache/cache.php
| * \ \ \ \ \ \ Merge branch 'master' into master-sqlserverThomas Mueller2013-02-18250-1857/+4929
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into master-sqlserverThomas Mueller2013-02-14553-9626/+20103
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/db.php lib/files/cache/cache.php lib/files/cache/legacy.php lib/setup.php
| * | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-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
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | New/rebased/cleaned-up MS SQL Server support
| | * | | | | | | | | | - 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-105-87/+148
| | | | | | | | | | | |
| | * | | | | | | | | | Added MS SQL Server supportTobias Ramforth2013-02-085-11/+346
| |/ / / / / / / / / /
| * | | | | | | | | | adding autotesting for mssql server - windows onlyThomas Mueller2013-02-071-10/+37
| | | | | | | | | | |
* | | | | | | | | | | 5 beta 2v5.0.0beta2Frank Karlitschek2013-02-251-2/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #1894 from owncloud/texfixFrank Karlitschek2013-02-251-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 Posselt2013-02-251-1/+1
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files actions
* | | | | | | | | | 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 #1864 from owncloud/fix_display_defaultFrank Karlitschek2013-02-251-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 Schiwon2013-02-221-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default value in settings
* | | | | | | | | | | | Merge pull request #1890 from owncloud/trashbin_fixBjörn Schießle2013-02-252-10/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | fix quota calculation for trash bin and versions