summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | 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-252-6/+1
|\ \ \ \ \
| * | | | | 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()Thomas Tanghus2013-02-221-2/+2
* | | | | | | Merge pull request #1706 from owncloud/master-sqlserverThomas Müller2013-02-258-50/+489
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into master-sqlserverThomas Mueller2013-02-22476-3781/+7569
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into master-sqlserverThomas Mueller2013-02-20100-741/+1250
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into master-sqlserverThomas Mueller2013-02-18250-1857/+4929
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into master-sqlserverThomas Mueller2013-02-14553-9626/+20103
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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
| * | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | - Fixed indentations.Administrator2013-02-102-77/+83
| | * | | | | | | | | | | | 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 registered fi...Bernhard Posselt2013-02-251-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #1891 from owncloud/set_timeoutBernhard Posselt2013-02-251-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | 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 default...Arthur Schiwon2013-02-221-7/+4
* | | | | | | | | | | | | | Merge pull request #1890 from owncloud/trashbin_fixBjörn Schießle2013-02-252-10/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | fix quota calculationBjörn Schießle2013-02-252-9/+11
| * | | | | | | | | | | | | | fix getVersion callBjörn Schießle2013-02-251-1/+1
* | | | | | | | | | | | | | | Merge pull request #1892 from owncloud/files_remove_row_on_deleteBjörn Schießle2013-02-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | delete table row if file was deleted instead of just hide itBjörn Schießle2013-02-251-1/+1
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #1889 from owncloud/use_distance_optionThomas Müller2013-02-251-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | use distance option to delay dragging in sane browsersJörn Friedrich Dreyer2013-02-251-0/+4
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #1865 from owncloud/fix-displaying-db-errorsBjörn Schießle2013-02-252-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Don't use routes when displaying error pageBart Visscher2013-02-222-3/+5
| | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #1823 from owncloud/update-expire-functionBjörn Schießle2013-02-256-80/+210
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | fix line endingsBjörn Schießle2013-02-251-94/+94
| * | | | | | | | | | | | | | Merge branch 'master' into update-expire-functionBjörn Schießle2013-02-2513-125/+288
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #1810 from owncloud/trashbin_encryptionBjörn Schießle2013-02-255-107/+172
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | some final code clean-upBjörn Schießle2013-02-251-4/+7
| * | | | | | | | | | | | | | | always use "==="Björn Schießle2013-02-251-5/+5
| * | | | | | | | | | | | | | | Merge branch 'master' into trashbin_encryptionBjörn Schießle2013-02-25506-4504/+8337
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'master' into trashbin_encryptionBjörn Schießle2013-02-2159-241/+357
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | don't show empty trash bin message for sub foldersBjörn Schießle2013-02-212-1/+2
| * | | | | | | | | | | | | | | | update path to deleted filesBjörn Schießle2013-02-201-3/+2
| * | | | | | | | | | | | | | | | some fixes for the keyfile handlingBjörn Schießle2013-02-201-10/+28