summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix version number - @karlitschek ;)Morris Jobke2014-07-041-1/+1
|
* master if 8.0 pre alpha nowFrank Karlitschek2014-07-031-2/+2
|
* Merge pull request #9410 from owncloud/shareownernamewidthJan-Christoph Borchardt2014-07-032-2/+129
|\ | | | | Improved remote share owner display
| * Improved remote share owner displayVincent Petry2014-07-032-2/+129
| | | | | | | | | | | | | | The parts of the remote share owner name is now split between user name, domain name and root so they can be formatted / displayed differently. The user name + domain name are displayed in the tooltip.
* | Merge pull request #9413 from owncloud/fix_hook_namesVincent Petry2014-07-031-2/+2
|\ \ | | | | | | fix hook names
| * | fix hook namesBjoern Schiessle2014-07-031-2/+2
| | |
* | | Merge pull request #9402 from owncloud/sharing_improved_dialogVincent Petry2014-07-031-6/+2
|\ \ \ | | | | | | | | only show message if default expire date is enforced
| * | | only show message if default expire date is enforcedBjoern Schiessle2014-07-031-6/+2
| |/ /
* | | Merge pull request #9408 from owncloud/redirectconsolelogfixVincent Petry2014-07-031-1/+0
|\ \ \ | | | | | | | | Remove forgotten debug log
| * | | Remove forgotten debug logVincent Petry2014-07-031-1/+0
| | |/ | |/|
* | | Merge pull request #9420 from owncloud/trashbin-hidesummarysizeMorris Jobke2014-07-031-0/+3
|\ \ \ | | | | | | | | Hide the size in the trashbin summary row
| * | | Hide the size in the trashbin summary rowVincent Petry2014-07-031-0/+3
| | | | | | | | | | | | | | | | | | | | This also fixes the extra spacing that appearing on the right of the table.
* | | | Merge pull request #9407 from owncloud/fix-share-logoMorris Jobke2014-07-032-1/+9
|\ \ \ \ | |/ / / |/| | | for shared links, use wide logo on desktop and icon on mobile
| * | | for shared links, use wide logo on desktop and icon on mobileJan-Christoph Borchardt2014-07-032-1/+9
| |/ /
* | | Merge pull request #9403 from owncloud/design-fix-fileslistbottomMorris Jobke2014-07-032-3/+7
|\ \ \ | | | | | | | | Fix bottom of files list, add proper space to have room for dropdowns
| * | | reduce file list bottom whitespace a bitJan-Christoph Borchardt2014-07-031-1/+1
| | | |
| * | | fix left margin of file list summaryJan-Christoph Borchardt2014-07-032-1/+5
| | | |
| * | | add whitespace to bottom of Files list – more obvious it's the end, and ↵Jan-Christoph Borchardt2014-07-031-2/+2
| |/ / | | | | | | | | | space for share dropdown
* | | Merge pull request #9394 from owncloud/design-fix-renameJan-Christoph Borchardt2014-07-031-4/+5
|\ \ \ | | | | | | | | fix position of rename function, and text size
| * | | fix checkbox shifting when rename input appearsJan-Christoph Borchardt2014-07-031-0/+2
| | | |
| * | | fix position of rename function, and text sizeJan-Christoph Borchardt2014-07-031-4/+3
| | | |
* | | | Merge pull request #9390 from owncloud/fix-9368Jan-Christoph Borchardt2014-07-031-2/+0
|\ \ \ \ | |_|/ / |/| | | Revert 'hides table header while users load.'
| * | | Revert "hides table header while users load."Arthur Schiwon2014-07-021-2/+0
| | | | | | | | | | | | | | | | This reverts commit 0dc12a3737127aad28be12f9417d2a63601a88ff.
* | | | Merge pull request #9384 from owncloud/eventsrc-fixfallbackwhenclosedMorris Jobke2014-07-031-12/+23
|\ \ \ \ | |_|_|/ |/| | | Fixed event source fallback after close
| * | | Fix JSHint errors in EventSource classVincent Petry2014-07-021-13/+18
| | | |
| * | | Fixed event source fallback after closeVincent Petry2014-07-021-0/+6
| | | |
* | | | Merge pull request #9391 from owncloud/design-mobile-shareJan-Christoph Borchardt2014-07-034-5/+14
|\ \ \ \ | | | | | | | | | | Fix mobile share view glitches
| * | | | use same logo for mobile as for when logged in, fix #9360Jan-Christoph Borchardt2014-07-021-2/+4
| | | | |
| * | | | hide text of download button, only show iconJan-Christoph Borchardt2014-07-022-1/+6
| | | | |
| * | | | shared view: remove whitespace glitch on rightJan-Christoph Borchardt2014-07-021-1/+1
| | | | |
| * | | | fix position of shared file buttonsJan-Christoph Borchardt2014-07-021-1/+3
| | |/ / | |/| |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-03391-11492/+13531
| |_|/ |/| |
* | | Merge pull request #9389 from owncloud/fix-nametext-heightJan-Christoph Borchardt2014-07-031-0/+1
|\ \ \ | | | | | | | | fix nametext height, was higher than the row
| * | | fix nametext height, was higher than the rowJan-Christoph Borchardt2014-07-021-0/+1
| |/ /
* | | Merge pull request #9365 from owncloud/design-controls-polishJan-Christoph Borchardt2014-07-032-2/+4
|\ \ \ | | | | | | | | Design controls polish
| * | | remove border-bottom of controls barJan-Christoph Borchardt2014-07-021-1/+0
| | | |
| * | | make sure table header is white instead of slightly greyJan-Christoph Borchardt2014-07-021-0/+3
| | | |
| * | | reduce transparency of controls bar for less distractionJan-Christoph Borchardt2014-07-021-1/+1
| | | |
| * | | change controls bar color to white for less grey-in-grey designJan-Christoph Borchardt2014-07-021-2/+2
| | | |
* | | | Merge pull request #9388 from owncloud/design-fix-sidebarMorris Jobke2014-07-032-6/+2
|\ \ \ \ | | | | | | | | | | fix animation of sidebar and prevent horizontal scrollbar, fix #9284
| * | | | fix animation of sidebar and prevent horizontal scrollbar, fix #9284Jan-Christoph Borchardt2014-07-022-6/+2
| | |/ / | |/| |
* | | | Merge pull request #9382 from owncloud/server2server-cssVolkan Gezer2014-07-032-2/+1
|\ \ \ \ | | | | | | | | | | fix lineheight of server2server share
| * | | | fix lineheight of server2server shareVolkan Gezer2014-07-022-2/+1
| | | | |
* | | | | Merge pull request #9374 from owncloud/link-contribute-promoteJan-Christoph Borchardt2014-07-022-0/+15
|\ \ \ \ \ | |_|/ / / |/| | | | add link to contribute and promote pages in personal settings
| * | | | personal: link straight to /promote as @tomneedham saidJan-Christoph Borchardt2014-07-021-1/+1
| | | | |
| * | | | add link to contribute and promote pages in personal settingsJan-Christoph Borchardt2014-07-022-0/+15
| | | | |
* | | | | Merge pull request #9381 from owncloud/design-icons-shadowJan-Christoph Borchardt2014-07-0237-177/+83
|\ \ \ \ \ | |_|_|_|/ |/| | | | Remove shadow effects from a bunch of icons, reduce size
| * | | | remove shadow effects from folder icons, reduce sizeJan-Christoph Borchardt2014-07-026-59/+54
| | | | |
| * | | | remove shadow effects from info, search and settings icon, reduce sizeJan-Christoph Borchardt2014-07-026-33/+6
| | | | |
| * | | | remove shadow effects from places icons, reduce sizeJan-Christoph Borchardt2014-07-0215-50/+12
| | | | |