Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Clubbing Exact styles together. | raghunayyar | 2013-04-24 | 1 | -5/+2 |
| | |||||
* | Add an update notification on every page for admin users | Lukas Reschke | 2013-04-24 | 5 | -36/+33 |
| | |||||
* | Merge pull request #3112 from owncloud/markdown-mimetype | icewind1991 | 2013-04-24 | 1 | -1/+5 |
|\ | | | | | Add markdown to mimetype list | ||||
| * | 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 | ||||
| * | | 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 | ||||
| * | | | - 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 | ||||
| * | | fix wrong shared icon description | Morris Jobke | 2013-04-24 | 1 | -0/+1 |
| |/ | | | | | | | | | | | fix #2928 translation of string "Shared" has to be marked as located in "files" for the translation extractor | ||||
* | | Merge pull request #3100 from owncloud/ensure_index_php | Daniel Molkentin | 2013-04-24 | 3 | -0/+8 |
|\ \ | | | | | | | Fix for #3049 | ||||
| * | | 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 |
| | | | | | | | | | | | | | | | Add JS redirect if that fails (HTTP-based redirects are disabled by default in more recent Firefox versions). | ||||
* | | | Merge pull request #3103 from owncloud/default-theme | Frank Karlitschek | 2013-04-24 | 4 | -4/+25 |
|\ \ \ | |_|/ |/| | | check if there is a default/ folder in the theme directory if no theme e... | ||||
| * | | 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 | ||||
| * | | Fix ugly error style on install | Markus Goetz | 2013-04-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | By initializing the template engine first we can show the 'Can't write into config directory 'config'' error in a nice way instead of plain unstyled HTML. | ||||
* | | | [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 @ | ||||
| * | | 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 | ||||
| * | | | External Storage: Check for curl in PHP | Markus Goetz | 2013-04-23 | 1 | -2/+12 |
| | |/ | |/| | | | | | | | If no curl is found, disable the storage that needs it. | ||||
* | | | 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 p... | ||||
| * | | | LDAP: reset user/group-config association only after exists-check, may ↵ | Arthur Schiwon | 2013-04-23 | 2 | -4/+18 |
| | | | | | | | | | | | | | | | | performance in some cases | ||||
* | | | | 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 operation | ||||
| * | | | Files: also check if the source path is valid when doing a rename or copy ↵ | Robin Appelman | 2013-04-22 | 1 | -15/+23 |
| | | | | | | | | | | | | | | | | operation | ||||
* | | | | [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 | ||||
| * | | 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 | ||||
| * | | | Improve error message if user creation fails during setup | Robin Appelman | 2013-04-22 | 1 | -1/+2 |
| |/ / | |||||
* | | | Merge pull request #3078 from owncloud/files-dnd | Bernhard Posselt | 2013-04-22 | 1 | -3/+3 |
|\ \ \ | |_|/ |/| | | Files: Fix XSS when creating dropshadow | ||||
| * | | Files: Fix XSS when creating dropshadow | Robin Appelman | 2013-04-22 | 1 | -3/+3 |
|/ / | |||||
* | | 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 | ||||
| * | Test if we want a 3rdparty style/script before checking the 3rdparty root | Bart Visscher | 2013-04-19 | 1 | -2/+4 |
| | | |||||
* | | Merge pull request #2983 from owncloud/style-details | Jan-Christoph Borchardt | 2013-04-22 | 2 | -37/+43 |
|\ \ | | | | | | | Style details | ||||
| * | | remove unnecessary border from navigation, looked strange with scrollbar and ↵ | Jan-Christoph Borchardt | 2013-04-17 | 1 | -1/+1 |
| | | | | | | | | | | | | pushed the text over 1px | ||||
| * | | move password warning more relevant below password field, un-nest log in warning | Jan-Christoph Borchardt | 2013-04-17 | 1 | -17/+15 |
| | | | |||||
| * | | move warning and error states together in CSS, to be cleaned up | Jan-Christoph Borchardt | 2013-04-17 | 1 | -11/+18 |
| | | | |||||
| * | | make textarea inherit ownCloud font instead of using monospace | Jan-Christoph Borchardt | 2013-04-17 | 1 | -0/+1 |
| | | | |||||
| * | | correct primary color to #1d2d44 where slightly wrong | Jan-Christoph Borchardt | 2013-04-17 | 1 | -8/+8 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-22 | 27 | -176/+298 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-21 | 11 | -11/+11 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-20 | 25 | -147/+163 |
| | | | |||||
* | | | 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 | ||||
| * | | Cleaner isWebDAVWorking reason, otherwise people overlook the reason | Bart Visscher | 2013-04-19 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #3024 from owncloud/file-delete-action | Bart Visscher | 2013-04-19 | 2 | -4/+4 |
|\ \ \ | | | | | | | | | Fix #1164 and fix showing spinner on delete | ||||
| * | | | Fix displaying spinner on delete | Bart Visscher | 2013-04-19 | 1 | -3/+3 |
| | | | | |||||
| * | | | No need to strip slashes, json_decode handles that for us | Bart Visscher | 2013-04-19 | 1 | -1/+1 |
|/ / / |