Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge master | Lukas Reschke | 2013-03-01 | 12 | -14/+55 |
|\ | |||||
| * | validate the generated email address and fall back to localhost.localdomain i... | Thomas Mueller | 2013-03-01 | 1 | -4/+7 |
| * | for this self test we don't care if the ssl certificate is self signed and th... | Thomas Mueller | 2013-03-01 | 1 | -0/+3 |
| * | Merge pull request #2008 from owncloud/1999-requesttoken | Frank Karlitschek | 2013-03-01 | 1 | -3/+7 |
| |\ | |||||
| | * | Check if requesttoken exists in session | Lukas Reschke | 2013-03-01 | 1 | -0/+4 |
| | * | Style fixes | Lukas Reschke | 2013-03-01 | 1 | -3/+3 |
| * | | 5.0 RC 1v5.0.0RC1 | Frank Karlitschek | 2013-03-01 | 1 | -2/+2 |
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-01 | 9 | -3/+12 |
| * | | Merge pull request #1937 from owncloud/check-resharing | Bart Visscher | 2013-02-28 | 1 | -2/+24 |
| |\ \ | | |/ | |/| | |||||
| | * | Check resharing setting | Michael Gapczynski | 2013-02-26 | 1 | -2/+24 |
* | | | Merge master | Lukas Reschke | 2013-02-28 | 7 | -12/+32 |
|\| | | |||||
| * | | Merge pull request #1988 from owncloud/permissionscache_clean | icewind1991 | 2013-02-28 | 2 | -10/+18 |
| |\ \ | |||||
| | * | | Cache: cleanup permissions cache when removing a file from the cache | Robin Appelman | 2013-02-28 | 1 | -0/+3 |
| | * | | Cache: add option to delete file from permissions cache for all users | Robin Appelman | 2013-02-28 | 1 | -10/+15 |
| * | | | Merge pull request #1989 from owncloud/selectSanitize | Björn Schießle | 2013-02-28 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Sanitize HTML in html_select_options | Lukas Reschke | 2013-02-28 | 1 | -1/+1 |
| * | | | add checks for xml and dom when installing | Bernhard Posselt | 2013-02-28 | 1 | -1/+10 |
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-28 | 3 | -0/+3 |
| |/ / | |||||
* | | | Merge master | Lukas Reschke | 2013-02-27 | 3 | -5/+32 |
|\| | | |||||
| * | | Merge pull request #1972 from owncloud/raw-pathinfo | Bernhard Posselt | 2013-02-27 | 2 | -2/+15 |
| |\ \ | |||||
| | * | | Use the plain urlencoded path info for the routing matching | Bart Visscher | 2013-02-27 | 2 | -2/+15 |
| | |/ | |||||
| * | | Disable query cache for Sqlite | Bart Visscher | 2013-02-27 | 1 | -1/+4 |
| * | | Merge pull request #1944 from owncloud/query-caching-upgrade | Bernhard Posselt | 2013-02-27 | 1 | -2/+13 |
| |\ \ | |||||
| | * | | Disable prepared query caching while doing an upgrade | Robin Appelman | 2013-02-26 | 1 | -2/+13 |
* | | | | [core] From echo to p | Lukas Reschke | 2013-02-27 | 3 | -9/+9 |
* | | | | Remove the template autoescaping | Lukas Reschke | 2013-02-27 | 1 | -3/+1 |
|/ / / | |||||
* | | | Merge pull request #1031 from owncloud/external_storage_ui_feedback | Michael Gapczynski | 2013-02-27 | 1 | -0/+7 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into external_storage_ui_feedback | Michael Gapczynski | 2013-02-25 | 32 | -219/+706 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into external_storage_ui_feedback | Michael Gapczynski | 2013-02-19 | 80 | -485/+1406 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into external_storage_ui_feedback | Thomas Mueller | 2013-02-12 | 8 | -13/+113 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into external_storage_ui_feedback | Thomas Mueller | 2013-02-12 | 8 | -0/+123 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into external_storage_ui_feedback | Michael Gapczynski | 2013-02-11 | 131 | -3917/+6905 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into external_storage_ui_feedback | Michael Gapczynski | 2013-01-09 | 32 | -907/+1095 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Move storage backend tests from constructor to test function | Michael Gapczynski | 2012-12-28 | 2 | -0/+9 |
* | | | | | | | | | | Merge pull request #1962 from owncloud/big_upload_fix | Bernhard Posselt | 2013-02-27 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | timeout after a longer time | Bernhard Posselt | 2013-02-27 | 1 | -2/+2 |
* | | | | | | | | | | | [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 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | 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 instead o... | Bernhard Posselt | 2013-02-27 | 1 | -1/+1 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #1948 from owncloud/improve_user_sorting | Bernhard Posselt | 2013-02-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | 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 |
|/ / / / / / / / | |||||
* | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | 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 |