| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into doctrine | Bart Visscher | 2013-04-25 | 78 | -240/+1157 |
|\ |
|
| * | Merge pull request #3132 from owncloud/mount-setupfs | icewind1991 | 2013-04-25 | 2 | -0/+4 |
| |\ |
|
| | * | Have the filecache updater testcase clean the filesystem properly | Robin Appelman | 2013-04-25 | 1 | -0/+1 |
| | * | Make sure the filesystem is initialized when searching for mounts | Robin Appelman | 2013-04-25 | 1 | -0/+3 |
| * | | Correct the parameter description | Lukas Reschke | 2013-04-25 | 1 | -1/+1 |
| * | | Correct function description | Lukas Reschke | 2013-04-25 | 1 | -1/+1 |
| * | | use utf-8 encoding for json | Bernhard Posselt | 2013-04-25 | 1 | -1/+1 |
| * | | Merge pull request #2993 from owncloud/resolve_apps_lib_path | Thomas Tanghus | 2013-04-24 | 1 | -2/+9 |
| |\ \
| | |/
| |/| |
|
| | * | Added explanation | Thomas Tanghus | 2013-04-18 | 1 | -0/+1 |
| | * | Let autoloader resolve paths under apps lib directory. | Thomas Tanghus | 2013-04-18 | 1 | -2/+8 |
| * | | Merge pull request #3112 from owncloud/markdown-mimetype | icewind1991 | 2013-04-24 | 1 | -1/+5 |
| |\ \ |
|
| | * | | Add markdown to mimetype list | Robin Appelman | 2013-04-24 | 1 | -1/+5 |
| * | | | Merge pull request #3111 from owncloud/csp-audio | icewind1991 | 2013-04-24 | 1 | -1/+2 |
| |\ \ \ |
|
| | * | | | Allow loading of external media ressources | Lukas Reschke | 2013-04-24 | 1 | -1/+2 |
| * | | | | Merge pull request #3106 from IMM0rtalis/xframe_restriction_config | Lukas Reschke | 2013-04-24 | 1 | -1/+6 |
| |\ \ \ \
| | |/ / /
| |/| | | |
|
| | * | | | - xframe restriction configurable now | Florian Scholz | 2013-04-24 | 1 | -1/+6 |
| | |/ / |
|
| * | | | Merge pull request #3100 from owncloud/ensure_index_php | Daniel Molkentin | 2013-04-24 | 1 | -0/+4 |
| |\ \ \ |
|
| | * | | | sync parameters in setup.php with the ones in the actual .htaccess | Daniel Molkentin | 2013-04-24 | 1 | -0/+4 |
| * | | | | use variable instead of relative path to file | Bernhard Posselt | 2013-04-24 | 1 | -1/+1 |
| * | | | | check if there is a default/ folder in the theme directory if no theme exists | Bernhard Posselt | 2013-04-24 | 4 | -4/+25 |
| | |/ /
| |/| | |
|
| * | | | Merge pull request #3089 from guruz/fix_ugly_config_writeability_error | Morris Jobke | 2013-04-24 | 1 | -1/+1 |
| |\ \ \
| | |/ /
| |/| | |
|
| | * | | Fix ugly error style on install | Markus Goetz | 2013-04-23 | 1 | -1/+1 |
| * | | | Merge pull request #3080 from owncloud/validate_redirect_mast | Bernhard Posselt | 2013-04-23 | 1 | -2/+7 |
| |\ \ \ |
|
| | * | | | Disallow URLs containing a @ | Lukas Reschke | 2013-04-23 | 1 | -2/+7 |
| * | | | | Merge pull request #3077 from owncloud/rename-checksourcepath | Lukas Reschke | 2013-04-23 | 1 | -15/+23 |
| |\ \ \ \
| | |_|/ /
| |/| | | |
|
| | * | | | Files: also check if the source path is valid when doing a rename or copy ope... | Robin Appelman | 2013-04-22 | 1 | -15/+23 |
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-23 | 1 | -0/+10 |
| * | | | | Merge pull request #3074 from owncloud/sqlite3-raiseerror | Bernhard Posselt | 2013-04-22 | 1 | -2/+2 |
| |\ \ \ \
| | |_|/ /
| |/| | | |
|
| | * | | | Fix raiseError call in the MDB2 sqlite3 driver | Robin Appelman | 2013-04-22 | 1 | -2/+2 |
| * | | | | Merge pull request #3073 from owncloud/setup-error-message | Bernhard Posselt | 2013-04-22 | 1 | -1/+2 |
| |\ \ \ \
| | |_|/ /
| |/| | | |
|
| | * | | | Improve error message if user creation fails during setup | Robin Appelman | 2013-04-22 | 1 | -1/+2 |
| | |/ / |
|
| * | | | Merge pull request #3019 from owncloud/fix-3004 | Bart Visscher | 2013-04-22 | 1 | -2/+4 |
| |\ \ \
| | |/ /
| |/| | |
|
| | * | | Test if we want a 3rdparty style/script before checking the 3rdparty root | Bart Visscher | 2013-04-19 | 1 | -2/+4 |
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-22 | 1 | -1/+40 |
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-20 | 1 | -10/+22 |
| * | | | Merge pull request #3020 from owncloud/cleaner-webdav-reason | Bart Visscher | 2013-04-19 | 1 | -1/+1 |
| |\ \ \
| | |/ /
| |/| | |
|
| | * | | Cleaner isWebDAVWorking reason, otherwise people overlook the reason | Bart Visscher | 2013-04-19 | 1 | -1/+1 |
| | |/ |
|
| * | | Merge pull request #3010 from owncloud/fix-cookie_path | Thomas Tanghus | 2013-04-19 | 1 | -2/+3 |
| |\ \ |
|
| | * | | Don't use empty session.cookie_path, otherwise we get multiple cookies | Bart Visscher | 2013-04-18 | 1 | -2/+3 |
| | |/ |
|
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-18 | 32 | -34/+2 |
| * | | Warn when we do an upgrade | Brice Maron | 2013-04-17 | 1 | -1/+1 |
| |/ |
|
| * | Merge pull request #2978 from owncloud/displayname_can_be_null | Bernhard Posselt | 2013-04-17 | 1 | -1/+1 |
| |\ |
|
| | * | Remove not null constraint. Fix #2976 | Thomas Tanghus | 2013-04-17 | 1 | -1/+1 |
| * | | Merge pull request #2975 from owncloud/log-date | Morris Jobke | 2013-04-17 | 1 | -1/+2 |
| |\ \
| | |/
| |/| |
|
| | * | fix admin log display and use a more readable format | Bernhard Posselt | 2013-04-17 | 1 | -1/+1 |
| | * | use date and time instead of timestamp | Bernhard Posselt | 2013-04-17 | 1 | -1/+2 |
| * | | Merge pull request #2746 from owncloud/use-count-userexists | Thomas Tanghus | 2013-04-17 | 1 | -2/+2 |
| |\ \ |
|
| | * | | Use the MDB2 function to get the count result | Bart Visscher | 2013-04-06 | 1 | -1/+1 |
| | * | | Use count SQL to check for user existance | Bart Visscher | 2013-04-05 | 1 | -2/+2 |
| * | | | Merge pull request #2915 from Kondou-ger/handle_empty_datafolder_better | Bart Visscher | 2013-04-17 | 1 | -1/+1 |
| |\ \ \ |
|