Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3132 from owncloud/mount-setupfs | icewind1991 | 2013-04-25 | 3 | -6/+7 |
|\ | |||||
| * | Have the filecache updater testcase clean the filesystem properly | Robin Appelman | 2013-04-25 | 2 | -6/+4 |
| * | 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 |
* | | Merge pull request #3126 from owncloud/json-utf8 | Thomas Tanghus | 2013-04-25 | 1 | -1/+1 |
|\ \ | |||||
| * | | use utf-8 encoding for json | Bernhard Posselt | 2013-04-25 | 1 | -1/+1 |
* | | | Merge pull request #3094 from owncloud/log-ajax | Bart Visscher | 2013-04-25 | 2 | -8/+6 |
|\ \ \ | |/ / |/| | | |||||
| * | | fix syntax layout | Morris Jobke | 2013-04-23 | 1 | -3/+6 |
| * | | remove log sort in admin section | Morris Jobke | 2013-04-23 | 1 | -5/+0 |
| * | | fix logical issue while retrieving log via ajax | Morris Jobke | 2013-04-23 | 1 | -1/+1 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-25 | 23 | -52/+60 |
* | | | 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 #3108 from owncloud/fileactions-order | Lukas Reschke | 2013-04-24 | 1 | -7/+7 |
|\ \ \ | |||||
| * | | | Files: fix the order fileactions are computed for a file | Robin Appelman | 2013-04-24 | 1 | -7/+7 |
* | | | | Merge pull request #3096 from owncloud/add_missing_space_for_new_groups | Raghu Nayyar | 2013-04-24 | 3 | -11/+11 |
|\ \ \ \ | |||||
| * | | | | Add space around checkboxes. | kondou | 2013-04-24 | 1 | -2/+4 |
| * | | | | Fix #3095. | kondou | 2013-04-24 | 3 | -11/+9 |
| | |_|/ | |/| | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-24 | 185 | -1461/+1519 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-24 | 108 | -755/+1071 |
* | | | | 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 | 2 | -2/+3 |
|\ \ \ \ | |||||
| * | | | | Allow loading of external media ressources | Lukas Reschke | 2013-04-24 | 2 | -2/+3 |
* | | | | | Merge pull request #3106 from IMM0rtalis/xframe_restriction_config | Lukas Reschke | 2013-04-24 | 2 | -1/+10 |
|\ \ \ \ \ | |||||
| * | | | | | - xframe restriction configurable now | Florian Scholz | 2013-04-24 | 2 | -1/+10 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #3109 from owncloud/fix-2928 | Morris Jobke | 2013-04-24 | 1 | -0/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | fix wrong shared icon description | Morris Jobke | 2013-04-24 | 1 | -0/+1 |
| |/ / / | |||||
* | | | | Merge pull request #3100 from owncloud/ensure_index_php | Daniel Molkentin | 2013-04-24 | 3 | -0/+8 |
|\ \ \ \ | |||||
| * | | | | sync parameters in setup.php with the ones in the actual .htaccess | Daniel Molkentin | 2013-04-24 | 1 | -0/+4 |
| * | | | | Try to prefer index.php over index.html in the same directory | Daniel Molkentin | 2013-04-24 | 2 | -0/+4 |
* | | | | | Merge pull request #3103 from owncloud/default-theme | Frank Karlitschek | 2013-04-24 | 4 | -4/+25 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | 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 |
| | |/ / | |/| | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-24 | 105 | -556/+1119 |
| |/ / |/| | | |||||
* | | | 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 #3092 from guruz/external_storage_check_for_curl | Frank Karlitschek | 2013-04-23 | 1 | -2/+12 |
|\ \ \ \ | |||||
| * | | | | External Storage: Check for curl in PHP | Markus Goetz | 2013-04-23 | 1 | -2/+12 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #3082 from owncloud/ldap_confcache_opt | Bart Visscher | 2013-04-23 | 2 | -4/+18 |
|\ \ \ \ | |||||
| * | | | | LDAP: reset user/group-config association only after exists-check, may perfor... | Arthur Schiwon | 2013-04-23 | 2 | -4/+18 |
* | | | | | 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 | 24 | -195/+221 |
| |/ / / |/| | | | |||||
* | | | | 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 |