summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3080 from owncloud/validate_redirect_mastBernhard Posselt2013-04-231-2/+7
|\
| * 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 PHPMarkus Goetz2013-04-231-2/+12
* | | 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 perfor...Arthur Schiwon2013-04-232-4/+18
* | | | 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 ope...Robin Appelman2013-04-221-15/+23
* | | | [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 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 setupRobin Appelman2013-04-221-1/+2
| |/ /
* | | Merge pull request #3078 from owncloud/files-dndBernhard Posselt2013-04-221-3/+3
|\ \ \ | |_|/ |/| |
| * | 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 rootBart Visscher2013-04-191-2/+4
* | Merge pull request #2983 from owncloud/style-detailsJan-Christoph Borchardt2013-04-222-37/+43
|\ \
| * | remove unnecessary border from navigation, looked strange with scrollbar and ...Jan-Christoph Borchardt2013-04-171-1/+1
| * | 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 reasonBart Visscher2013-04-191-1/+1
* | | Merge pull request #3024 from owncloud/file-delete-actionBart Visscher2013-04-192-4/+4
|\ \ \
| * | | 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
|/ / /
* | | Merge pull request #3010 from owncloud/fix-cookie_pathThomas Tanghus2013-04-191-2/+3
|\ \ \
| * | | Don't use empty session.cookie_path, otherwise we get multiple cookiesBart Visscher2013-04-181-2/+3
| |/ /
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-1911-11/+11
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-18140-941/+643
* | | Merge pull request #2986 from eMerzh/upgrade_warnBernhard Posselt2013-04-171-1/+1
|\ \ \
| * | | Warn when we do an upgradeBrice Maron2013-04-171-1/+1
|/ / /
* | | Merge pull request #2925 from owncloud/navigation-icon-fixRaghu Nayyar2013-04-171-6/+29
|\ \ \ | |/ / |/| |
| * | apply navigation hover effect directly to img and span, cleaner codeJan-Christoph Borchardt2013-04-171-3/+23
| * | additional commentsJan-Christoph Borchardt2013-04-141-3/+3
| * | fix navigation hover effect, documentationJan-Christoph Borchardt2013-04-141-5/+8
* | | Merge pull request #2978 from owncloud/displayname_can_be_nullBernhard Posselt2013-04-172-2/+1
|\ \ \
| * | | Remove not null constraint. Fix #2976Thomas Tanghus2013-04-172-2/+1
* | | | Merge pull request #2975 from owncloud/log-dateMorris Jobke2013-04-173-3/+12
|\ \ \ \ | |/ / / |/| | |
| * | | also adjust template properly for log date fixBernhard Posselt2013-04-171-1/+5
| * | | fix admin log display and use a more readable formatBernhard Posselt2013-04-172-2/+6
| * | | use date and time instead of timestampBernhard Posselt2013-04-171-1/+2
* | | | Merge pull request #2746 from owncloud/use-count-userexistsThomas Tanghus2013-04-171-2/+2
|\ \ \ \
| * | | | Use the MDB2 function to get the count resultBart Visscher2013-04-061-1/+1
| * | | | Use count SQL to check for user existanceBart Visscher2013-04-051-2/+2