summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into navigationJan-Christoph Borchardt2013-01-314-10/+15
|\
| * Merge pull request #1387 from schiesbn/visual_improvementsThomas Müller2013-01-311-0/+1
| |\
| | * use the same tooltip as for the password fieldBjörn Schießle2013-01-311-0/+1
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-01-312-7/+10
| * | Merge pull request #1358 from owncloud/button-fixJan-Christoph Borchardt2013-01-311-3/+4
| |\ \
| | * | no box-shadow for public share download buttonJan-Christoph Borchardt2013-01-311-1/+1
| | * | change button box-shadow from hard white to slight transparentJan-Christoph Borchardt2013-01-311-2/+2
| | * | increase opacity of buttons, fix for dark backgrounds like header in public s...Jan-Christoph Borchardt2013-01-291-2/+3
* | | | Merge branch 'master' into navigationJan-Christoph Borchardt2013-01-3156-1/+88
|\| | |
| * | | fix merge conflictBjörn Schießle2013-01-3163-989/+1129
| |\ \ \
| | * | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-3155-1/+88
| | | |/ | | |/|
| * | | make background transparentBjörn Schießle2013-01-301-0/+0
| * | | icons added; empty trash bin message addedBjörn Schießle2013-01-291-0/+0
* | | | increase opacity of inactive apps and settings entries for better visibilityJan-Christoph Borchardt2013-01-311-3/+3
* | | | vertical scrollbar for app navigation when too many appsJan-Christoph Borchardt2013-01-311-1/+6
* | | | ellipsize long app names in navigationJan-Christoph Borchardt2013-01-311-0/+1
* | | | Merge pull request #1359 from raghunayyar/navigationJan-Christoph Borchardt2013-01-311-0/+6
|\ \ \ \
| * | | | Reduced Styling and Image loads as from src and not backgorund.raghunayyar2013-01-301-2/+3
| * | | | No Image Repetition on Enabling Apps in Navigation Barraghunayyar2013-01-301-0/+5
* | | | | use new user function to display real name if available, username still fallbackJan-Christoph Borchardt2013-01-301-1/+1
* | | | | Merge branch 'master' into navigationJan-Christoph Borchardt2013-01-3055-963/+1018
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-3015-1/+38
| * | | | Merge pull request #1360 from owncloud/display_nameLukas Reschke2013-01-293-19/+20
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | prevent xssBjörn Schießle2013-01-291-1/+1
| | * | | search display name instead of uid; fix key/value order for array accessBjörn Schießle2013-01-281-1/+1
| | * | | use display name to show share_width and owner informationBjörn Schießle2013-01-251-9/+9
| | * | | show display name instead of uidBjörn Schießle2013-01-251-9/+10
| | * | | add display name to title instead if login-IDBjörn Schießle2013-01-241-1/+1
| * | | | Merge pull request #1324 from owncloud/permanent-share-iconsMichael Gapczynski2013-01-282-5/+22
| |\ \ \ \
| | * | | | Change file action text for files inside shared folders as wellMichael Gapczynski2013-01-281-0/+1
| | * | | | Change file action text to 'Shared'Michael Gapczynski2013-01-281-0/+3
| | * | | | Merge branch 'master' into permanent-share-iconsJan-Christoph Borchardt2013-01-2811-109/+199
| | |\ \ \ \
| | * | | | | Permanently display shared status iconsMichael Gapczynski2013-01-262-5/+18
| * | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-2949-938/+938
| | |/ / / / | |/| | | |
* | | | | | merge stylesJan-Christoph Borchardt2013-01-2847-1335/+16456
|\| | | | |
| * | | | | Merge branch 'master' into updater-CSPThomas Mueller2013-01-2816-135/+277
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge pull request #1321 from owncloud/csp-fixesThomas Müller2013-01-281-3/+7
| | |\ \ \ \
| | | * | | | Fix undefined variableLukas Reschke2013-01-261-3/+7
| | | |/ / /
| | * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-281-0/+20
| | * | | | Merge pull request #1326 from owncloud/event-source-tokenLukas Reschke2013-01-262-2/+1
| | |\ \ \ \
| | | * | | | Use global oc_requesttoken for Event SourceMichael Gapczynski2013-01-262-2/+1
| | | |/ / /
| | * / / / [tx-robot] updated from transifexJenkins for ownCloud2013-01-276-79/+148
| | |/ / /
| | * | | Merge pull request #1059 from owncloud/fixing-998-masterThomas Müller2013-01-263-11/+50
| | |\ \ \
| | | * | | update used space percent after each ajax call and display the notificationThomas Mueller2013-01-191-2/+5
| | | * | | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-1867-361/+322
| | | |\ \ \
| | | * | | | pin notification to the topThomas Mueller2013-01-111-1/+1
| | | * | | | fixing text-align on navigation menu - closing div was missing - THX LukasThomas Mueller2013-01-111-1/+1
| | | * | | | displaying notification now centeredThomas Mueller2013-01-113-4/+8
| | | * | | | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-1121-124/+143
| | | |\ \ \ \
| | | * | | | | bring back L250 as spotted by @tanghus - THXThomas Mueller2013-01-081-0/+1