summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix ugly giant trianglesJan-Christoph Borchardt2013-02-274-26/+18
* fix shared by text going out of box, fix #895Jan-Christoph Borchardt2013-02-271-1/+3
* Merge pull request #1800 from raghunayyar/sharing-dropdown-fixesJan-Christoph Borchardt2013-02-272-2/+10
|\
| * Reduced email input width by 10% to increase space.raghunayyar2013-02-201-1/+1
| * Hovering on the unshare doesnt spoil lookraghunayyar2013-02-201-0/+4
| * Fixes the Email Button and the email input Width.raghunayyar2013-02-201-2/+2
| * Merge branch 'sharing-css-fix' into sharing-dropdown-fixesraghunayyar2013-02-201-0/+4
| |\
| | * Text stays inside the sharing dropdownraghunayyar2013-02-191-0/+4
* | | Merge pull request #1949 from owncloud/fix-dropboxMichael Gapczynski2013-02-261-2/+2
|\ \ \
| * | | Fix undefined root parameter in Dropbox storageMichael Gapczynski2013-02-261-2/+2
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-2775-440/+2891
|/ / /
* | | Merge pull request #1931 from owncloud/fastcgiThomas Müller2013-02-261-0/+1
|\ \ \
| * | | add cgi pathinfo when fcgi is enabled #1189Bernhard Posselt2013-02-261-0/+1
* | | | Merge pull request #1942 from owncloud/fix-1925-wrong-quotesThomas Müller2013-02-265-20/+20
|\ \ \ \
| * | | | Fix using wrong quotes for breaking long linesBart Visscher2013-02-265-20/+20
* | | | | Merge pull request #1929 from owncloud/htaccess-utf8Thomas Müller2013-02-261-0/+1
|\ \ \ \ \
| * | | | | added defaultcharset to utf-8 in htaccessBernhard Posselt2013-02-261-0/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #1941 from owncloud/session_heartbeatBart Visscher2013-02-261-1/+1
|\ \ \ \ \
| * | | | | generate url only onceBernhard Posselt2013-02-261-1/+1
* | | | | | Merge pull request #1939 from owncloud/session_heartbeatLukas Reschke2013-02-261-1/+1
|\| | | | | | |_|/ / / |/| | | |
| * | | | use 15 min instead of 15 sec timeoutBernhard Posselt2013-02-261-1/+1
* | | | | Merge pull request #1938 from owncloud/session_heartbeatFrank Karlitschek2013-02-262-0/+20
|\| | | |
| * | | | implemented a heartbeat request which is calls the server every 15 minutes to...Bernhard Posselt2013-02-262-0/+20
| |/ / /
* | | | Merge pull request #1920 from owncloud/catch_vcategories_exceptionsLukas Reschke2013-02-261-18/+34
|\ \ \ \
| * | | | Catch exceptions on malformed categories.Thomas Tanghus2013-02-261-18/+34
* | | | | Merge pull request #1922 from owncloud/missing_Thomas Müller2013-02-261-1/+1
|\ \ \ \ \
| * | | | | Add missing echoLukas Reschke2013-02-261-1/+1
|/ / / / /
* | | | | Merge pull request #1915 from owncloud/fix_webdav_mountFrank Karlitschek2013-02-261-1/+1
|\ \ \ \ \
| * | | | | cleanPath needs to be publicBjörn Schießle2013-02-261-1/+1
| |/ / / /
* | | | | Merge pull request #1919 from owncloud/logo-pixelperfectFrank Karlitschek2013-02-265-814/+55
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | remove more unused logo files, now in promoJan-Christoph Borchardt2013-02-263-764/+0
| * | | | align logo type pixel perfectlyJan-Christoph Borchardt2013-02-262-50/+55
|/ / / /
* | | | Merge pull request #1902 from owncloud/angularcspFrank Karlitschek2013-02-263-3/+3
|\ \ \ \ | |/ / / |/| | |
| * | | add CSP turned on for angularjsBernhard Posselt2013-02-253-3/+3
* | | | Merge pull request #1906 from owncloud/storage-stat-failBernhard Posselt2013-02-261-83/+116
|\ \ \ \
| * | | | Storage: don't throw warnings when a stat failsRobin Appelman2013-02-261-2/+10
| * | | | Code styleRobin Appelman2013-02-261-81/+106
* | | | | Merge pull request #1903 from owncloud/fix_version_checkBernhard Posselt2013-02-262-0/+10
|\ \ \ \ \
| * | | | | return true once one owncloud version number is bigger at any positionBernhard Posselt2013-02-252-0/+10
| | |/ / / | |/| | |
* | | | | Merge pull request #1885 from houqp/issue_1776Frank Karlitschek2013-02-262-2/+5
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | remove GwrQingping Hou2013-02-251-116/+0
| * | | | use text method instead of html methodQingping Hou2013-02-251-0/+116
| * | | | Merge branch 'master' of github.com:owncloud/core into issue_1776Qingping Hou2013-02-2574-550/+1391
| |\ \ \ \
| * | | | | add span tag to displayname on expand buttonQingping Hou2013-02-252-4/+2
| * | | | | update oldDisplayName value on displayName changeQingping Hou2013-02-241-0/+1
| * | | | | when user changes displayName, also update it on expand buttonQingping Hou2013-02-241-1/+5
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-26105-2606/+5428
| |/ / / / |/| | | |
* | | | | Merge pull request #1898 from owncloud/session_start_fixLukas Reschke2013-02-251-2/+15
|\ \ \ \ \
| * | | | | use error templateBernhard Posselt2013-02-251-3/+9
| * | | | | added simple error message for the browserBernhard Posselt2013-02-251-0/+2