summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | Move data directory permission checks after data directory existence checksMichael Gapczynski2013-01-121-29/+28
* | | | | | | | | | Merge pull request #1287 from owncloud/ocs_xml_attributesThomas Müller2013-01-311-2/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Simpler method for getting the first charTom Needham2013-01-241-1/+1
| * | | | | | | | | | Remove some whitespaceTom Needham2013-01-241-4/+0
| * | | | | | | | | | API: If key begins with '@' treat it as an xml attributeTom Needham2013-01-241-2/+9
* | | | | | | | | | | Merge pull request #1351 from owncloud/navigationMichael Gapczynski2013-01-3131-3653/+583
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | use translate string for Log out, remove titleJan-Christoph Borchardt2013-01-311-2/+2
| * | | | | | | | | | fix svg fallback replacement for settings iconsJan-Christoph Borchardt2013-01-311-1/+1
| * | | | | | | | | | fix header for shared linksJan-Christoph Borchardt2013-01-311-1/+3
| * | | | | | | | | | Merge branch 'master' into navigationJan-Christoph Borchardt2013-01-31297-2910/+7811
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'master' into navigationJan-Christoph Borchardt2013-01-31473-7499/+10484
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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-312-4/+10
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Shorter, Cleaner JS in apps.jsraghunayyar2013-01-311-8/+4
| | * | | | | | | | | | | Reduced Styling and Image loads as from src and not backgorund.raghunayyar2013-01-302-3/+5
| | * | | | | | | | | | | No Image Repetition on Enabling Apps in Navigation Barraghunayyar2013-01-302-1/+9
| * | | | | | | | | | | | 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-30326-9711/+11697
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| * | | | | | | | | | | | merge stylesJan-Christoph Borchardt2013-01-28561-9220/+31818
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | update Files icon from home to files, update Home icon from checkbox to homeJan-Christoph Borchardt2013-01-284-34/+78
| * | | | | | | | | | | | | undo padding change on buttons, otherwise it will mess up the upload and new ...Jan-Christoph Borchardt2013-01-281-1/+1
| * | | | | | | | | | | | | merge changes in navigationJan-Christoph Borchardt2013-01-283-6/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | More Style Fixesraghunayyar2013-01-251-2/+1
| | * | | | | | | | | | | | Defined height for #leftcontentraghunayyar2013-01-252-2/+2
| | * | | | | | | | | | | | Style fixes on core/navigation Branch.raghunayyar2013-01-251-2/+2
| * | | | | | | | | | | | | fix up content and content-wrapper merge ...Jan-Christoph Borchardt2013-01-18261-3245/+4370
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | new settings menu for new designJan-Christoph Borchardt2013-01-1713-275/+95
| * | | | | | | | | | | | | new app icon style for new designJan-Christoph Borchardt2013-01-178-64/+45
| * | | | | | | | | | | | | merge master into navigationJan-Christoph Borchardt2013-01-15847-18820/+28224
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | remove padding from headerJan-Christoph Borchardt2012-12-191-1/+1
| * | | | | | | | | | | | | | merge master into navigationJan-Christoph Borchardt2012-12-181044-25260/+46122
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into navigationJan-Christoph Borchardt2012-11-02127-2536/+2491
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into navigationJan-Christoph Borchardt2012-11-0153-391/+664
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'navigation' of github.com:owncloud/core into navigationJan-Christoph Borchardt2012-10-311-0/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | added old functions again to not break apps, but show a deprecation warningBernhard Posselt2012-10-291-0/+30
| * | | | | | | | | | | | | | | | | | Merge branch 'master' into navigationJan-Christoph Borchardt2012-10-30138-3584/+3682
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | enable hover state, now that needs to be added to the other iconsJan-Christoph Borchardt2012-10-282-8/+31
| * | | | | | | | | | | | | | | | | | merge breadcrumb root into navigationJan-Christoph Borchardt2012-10-2815-193/+2029
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | first version of breadcrumb 'root', still have a weird feeling about thisJan-Christoph Borchardt2012-10-288-31/+1853
| * | | | | | | | | | | | | | | | | | | Merge branch 'navigation' of github.com:owncloud/core into navigationJan-Christoph Borchardt2012-10-282-37/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | dont resize content div with javascript but use css box-sizing to do itBernhard Posselt2012-10-272-37/+8
| * | | | | | | | | | | | | | | | | | | | improve user menuJan-Christoph Borchardt2012-10-282-6/+5
| * | | | | | | | | | | | | | | | | | | | Merge branch 'master' into navigationJan-Christoph Borchardt2012-10-28798-194492/+4030
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | first move of settings to top rightJan-Christoph Borchardt2012-10-274-24/+147
| * | | | | | | | | | | | | | | | | | | | first icon update. Next step: make sprited hover state (like for home already)Jan-Christoph Borchardt2012-10-279-5023/+142
| * | | | | | | | | | | | | | | | | | | | first base on navigation rework, less obtrusive, icons need to be updated, se...Jan-Christoph Borchardt2012-10-267-89/+66
* | | | | | | | | | | | | | | | | | | | | Merge pull request #1099 from herbrechtsmeier/ssl-proxyThomas Müller2013-01-3110-9/+130
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | add SSL proxy supportherbrechtsmeier2013-01-312-4/+16