aboutsummaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-03-061-1/+20
* Merge pull request #2077 from owncloud/oc_filepicker_inline_jsLukas Reschke2013-03-041-4/+6
|\
| * Remove inline js from OC.Dialogs.FilePicker.Thomas Tanghus2013-03-041-4/+6
* | explicitly add empty placeholder to inputs which use infield labels, fix #2049Jan-Christoph Borchardt2013-03-043-10/+10
|/
* Merge pull request #2062 from owncloud/shareTypeBernhard Posselt2013-03-031-3/+3
|\
| * Sanitize shareWithLukas Reschke2013-03-041-3/+3
* | [tx-robot] updated from transifexJenkins for ownCloud2013-03-041-12/+12
|/
* Merge pull request #2034 from owncloud/fix_bug47Michael Gapczynski2013-03-031-40/+49
|\
| * new Array() -> []Georg Ehrke2013-03-021-1/+1
| * update OC.Notification.showGeorg Ehrke2013-03-021-9/+3
| * fix oc#47Georg Ehrke2013-03-011-39/+54
* | add ie css switch to layout templatesJörn Friedrich Dreyer2013-03-033-3/+18
* | [tx-robot] updated from transifexJenkins for ownCloud2013-03-031-45/+45
* | Avoid to display empty DisplayNames for menu and titleBrice Maron2013-03-021-2/+2
* | Merge pull request #2022 from owncloud/fix-noticeThomas Müller2013-03-011-1/+2
|\ \
| * | Fix noticeLukas Reschke2013-03-021-1/+2
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-021-4/+4
* | | Merge masterLukas Reschke2013-03-011-2/+2
|\| |
| * | The router base url is without / on the endBart Visscher2013-02-281-2/+2
* | | Merge masterLukas Reschke2013-02-284-5/+11
|\| |
| * | up limit of share dropdown from 4 to 15, scrollbar after 4 1/2 entries, fix #135Jan-Christoph Borchardt2013-02-282-3/+9
| * | Merge pull request #1973 from owncloud/share-improvementsJan-Christoph Borchardt2013-02-271-1/+1
| |\ \
| | * | reduce minimum length for username suggestions in share dialog, fix #1666Jan-Christoph Borchardt2013-02-271-1/+1
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-281-1/+1
* | | | Merge masterLukas Reschke2013-02-271-1/+2
|\| | |
| * | | Merge pull request #1944 from owncloud/query-caching-upgradeBernhard Posselt2013-02-271-1/+2
| |\ \ \ | | |/ / | |/| |
| | * | Disable prepared query caching while doing an upgradeRobin Appelman2013-02-261-1/+2
* | | | Typo...Lukas Reschke2013-02-271-1/+1
* | | | Add a missing )Lukas Reschke2013-02-271-1/+1
* | | | [core] From echo to pLukas Reschke2013-02-2711-116/+116
* | | | Remove uneeded fileLukas Reschke2013-02-271-32/+0
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-272-9/+21
* | | Merge pull request #1955 from owncloud/login-button-alignmentBernhard Posselt2013-02-271-0/+1
|\ \ \
| * | | quick fix for log in button not being aligned with input fieldsJan-Christoph Borchardt2013-02-271-0/+1
* | | | Merge pull request #1957 from owncloud/fix-895Bernhard Posselt2013-02-275-27/+26
|\ \ \ \
| * | | | properly align triangle and unshare icons to text, also fixes line hoppingJan-Christoph Borchardt2013-02-271-0/+5
| * | | | 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 #1905 from owncloud/fix-share-iconsThomas Müller2013-02-271-6/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Move spaceMichael Gapczynski2013-02-251-4/+4
| * | | | Fix adding share icons to share actionMichael Gapczynski2013-02-251-6/+6
* | | | | 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
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-272-2/+10
| |_|_|/ / |/| | | |
* | | | | Merge pull request #1941 from owncloud/session_heartbeatBart Visscher2013-02-261-1/+1
|\ \ \ \ \
| * | | | | generate url only onceBernhard Posselt2013-02-261-1/+1