summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Clubbing Exact styles together.raghunayyar2013-04-241-5/+2
|
* Add an update notification on every page for admin usersLukas Reschke2013-04-245-36/+33
|
* Merge pull request #3112 from owncloud/markdown-mimetypeicewind19912013-04-241-1/+5
|\ | | | | Add markdown to mimetype list
| * Add markdown to mimetype listRobin Appelman2013-04-241-1/+5
| |
* | Merge pull request #3111 from owncloud/csp-audioicewind19912013-04-242-2/+3
|\ \ | | | | | | Allow loading of external media ressources
| * | Allow loading of external media ressourcesLukas Reschke2013-04-242-2/+3
| | |
* | | Merge pull request #3106 from IMM0rtalis/xframe_restriction_configLukas Reschke2013-04-242-1/+10
|\ \ \ | | | | | | | | - xframe restriction configurable now
| * | | - xframe restriction configurable nowFlorian Scholz2013-04-242-1/+10
| | |/ | |/|
* | | Merge pull request #3109 from owncloud/fix-2928Morris Jobke2013-04-241-0/+1
|\ \ \ | |_|/ |/| | fix wrong shared icon description
| * | fix wrong shared icon descriptionMorris Jobke2013-04-241-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_phpDaniel Molkentin2013-04-243-0/+8
|\ \ | | | | | | Fix for #3049
| * | sync parameters in setup.php with the ones in the actual .htaccessDaniel Molkentin2013-04-241-0/+4
| | |
| * | Try to prefer index.php over index.html in the same directoryDaniel Molkentin2013-04-242-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-themeFrank Karlitschek2013-04-244-4/+25
|\ \ \ | |_|/ |/| | check if there is a default/ folder in the theme directory if no theme e...
| * | use variable instead of relative path to fileBernhard Posselt2013-04-241-1/+1
| | |
| * | check if there is a default/ folder in the theme directory if no theme existsBernhard Posselt2013-04-244-4/+25
|/ /
* | Merge pull request #3089 from guruz/fix_ugly_config_writeability_errorMorris Jobke2013-04-241-1/+1
|\ \ | | | | | | Fix ugly error style on install
| * | Fix ugly error style on installMarkus Goetz2013-04-231-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 transifexJenkins for ownCloud2013-04-24105-556/+1119
| |/ |/|
* | Merge pull request #3080 from owncloud/validate_redirect_mastBernhard Posselt2013-04-231-2/+7
|\ \ | | | | | | Disallow URLs containing a @
| * | Disallow URLs containing a @Lukas Reschke2013-04-231-2/+7
| | |
* | | Merge pull request #3092 from guruz/external_storage_check_for_curlFrank Karlitschek2013-04-231-2/+12
|\ \ \ | | | | | | | | External Storage: Check for curl in PHP
| * | | External Storage: Check for curl in PHPMarkus Goetz2013-04-231-2/+12
| | |/ | |/| | | | | | | If no curl is found, disable the storage that needs it.
* | | Merge pull request #3082 from owncloud/ldap_confcache_optBart Visscher2013-04-232-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 Schiwon2013-04-232-4/+18
| | | | | | | | | | | | | | | | performance in some cases
* | | | Merge pull request #3077 from owncloud/rename-checksourcepathLukas Reschke2013-04-231-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 Appelman2013-04-221-15/+23
| | | | | | | | | | | | | | | | operation
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-2324-195/+221
| |/ / |/| |
* | | Merge pull request #3074 from owncloud/sqlite3-raiseerrorBernhard Posselt2013-04-221-2/+2
|\ \ \ | |_|/ |/| | Fix raiseError call in the MDB2 sqlite3 driver
| * | Fix raiseError call in the MDB2 sqlite3 driverRobin Appelman2013-04-221-2/+2
| | |
* | | Merge pull request #3073 from owncloud/setup-error-messageBernhard Posselt2013-04-221-1/+2
|\ \ \ | | | | | | | | Improve error message if user creation fails during setup
| * | | Improve error message if user creation fails during setupRobin Appelman2013-04-221-1/+2
| |/ /
* | | Merge pull request #3078 from owncloud/files-dndBernhard Posselt2013-04-221-3/+3
|\ \ \ | |_|/ |/| | Files: Fix XSS when creating dropshadow
| * | Files: Fix XSS when creating dropshadowRobin Appelman2013-04-221-3/+3
|/ /
* | Merge pull request #3019 from owncloud/fix-3004Bart Visscher2013-04-221-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 rootBart Visscher2013-04-191-2/+4
| |
* | Merge pull request #2983 from owncloud/style-detailsJan-Christoph Borchardt2013-04-222-37/+43
|\ \ | | | | | | Style details
| * | remove unnecessary border from navigation, looked strange with scrollbar and ↵Jan-Christoph Borchardt2013-04-171-1/+1
| | | | | | | | | | | | pushed the text over 1px
| * | move password warning more relevant below password field, un-nest log in warningJan-Christoph Borchardt2013-04-171-17/+15
| | |
| * | move warning and error states together in CSS, to be cleaned upJan-Christoph Borchardt2013-04-171-11/+18
| | |
| * | make textarea inherit ownCloud font instead of using monospaceJan-Christoph Borchardt2013-04-171-0/+1
| | |
| * | correct primary color to #1d2d44 where slightly wrongJan-Christoph Borchardt2013-04-171-8/+8
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-2227-176/+298
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-2111-11/+11
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-2025-147/+163
| | |
* | | Merge pull request #3020 from owncloud/cleaner-webdav-reasonBart Visscher2013-04-191-1/+1
|\ \ \ | |_|/ |/| | Cleaner isWebDAVWorking reason, otherwise people overlook the reason
| * | Cleaner isWebDAVWorking reason, otherwise people overlook the reasonBart Visscher2013-04-191-1/+1
| | |
* | | Merge pull request #3024 from owncloud/file-delete-actionBart Visscher2013-04-192-4/+4
|\ \ \ | | | | | | | | Fix #1164 and fix showing spinner on delete
| * | | Fix displaying spinner on deleteBart Visscher2013-04-191-3/+3
| | | |
| * | | No need to strip slashes, json_decode handles that for usBart Visscher2013-04-191-1/+1
|/ / /