| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | [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 | ||||
| | * | | | | | | | | | | | fix quota calculation | Björn Schießle | 2013-02-25 | 2 | -9/+11 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | fix getVersion call | Björn Schießle | 2013-02-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #1892 from owncloud/files_remove_row_on_delete | Björn Schießle | 2013-02-25 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | delete table row if file was deleted instead of just hide it | ||||
| | * | | | | | | | | | | | | delete table row if file was deleted instead of just hide it | Björn Schießle | 2013-02-25 | 1 | -1/+1 |
| | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Merge pull request #1889 from owncloud/use_distance_option | Thomas Müller | 2013-02-25 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | use distance option to delay dragging in sane browsers | ||||
| | * | | | | | | | | | | | | use distance option to delay dragging in sane browsers | Jörn Friedrich Dreyer | 2013-02-25 | 1 | -0/+4 |
| | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | | 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 #1823 from owncloud/update-expire-function | Björn Schießle | 2013-02-25 | 6 | -80/+210 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Update expire function | ||||
| | * | | | | | | | | | | | fix line endings | Björn Schießle | 2013-02-25 | 1 | -94/+94 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge branch 'master' into update-expire-function | Björn Schießle | 2013-02-25 | 13 | -125/+288 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_trashbin/appinfo/version apps/files_trashbin/lib/trash.php | ||||
| * | | | | | | | | | | | | Merge pull request #1810 from owncloud/trashbin_encryption | Björn Schießle | 2013-02-25 | 5 | -107/+172 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Trashbin file encryption support | ||||
| | * | | | | | | | | | | | | some final code clean-up | Björn Schießle | 2013-02-25 | 1 | -4/+7 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | always use "===" | Björn Schießle | 2013-02-25 | 1 | -5/+5 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Merge branch 'master' into trashbin_encryption | Björn Schießle | 2013-02-25 | 506 | -4504/+8337 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_trashbin/index.php apps/files_trashbin/lib/trash.php | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |