Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #9441 from owncloud/install-sql-host-default | Thomas Müller | 2014-07-04 | 1 | -1/+1 |
|\ | | | | | Set localhost as default database host for installation | ||||
| * | set localhost as default database host for installation | Robin Appelman | 2014-07-04 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #9444 from owncloud/design-fix-pointer | Morris Jobke | 2014-07-04 | 2 | -3/+9 |
|\ \ | | | | | | | Design polish | ||||
| * | | fix cursor for other elements in top right corner | Morris Jobke | 2014-07-04 | 1 | -0/+3 |
| | | | |||||
| * | | fix 'remember' label being slightly off in log in | Jan-Christoph Borchardt | 2014-07-04 | 1 | -0/+1 |
| | | | |||||
| * | | fix icons being slightly off in log in | Jan-Christoph Borchardt | 2014-07-04 | 1 | -3/+2 |
| | | | |||||
| * | | fix user menu name and image not showing clicky mouse pointer | Jan-Christoph Borchardt | 2014-07-04 | 1 | -0/+3 |
| | | | |||||
* | | | Merge pull request #9440 from owncloud/files-fileactionsdeepcopy | Morris Jobke | 2014-07-04 | 2 | -10/+156 |
|\ \ \ | | | | | | | | | Fix FileActions merging override | ||||
| * | | | Fix FileActions merging override | Vincent Petry | 2014-07-04 | 2 | -10/+156 |
| | |/ | |/| | | | | | | | | | | | | | When merging FileActions, the register() functio needs to correctly override the previously merged action handler without affecting the original one. | ||||
* | | | Merge pull request #9426 from owncloud/design-remoteshare-confirm | Morris Jobke | 2014-07-04 | 3 | -8/+35 |
|\ \ \ | | | | | | | | | use icon-confirm instead of text for accepting remote share, works better with translations | ||||
| * | | | IE8 fixes | Morris Jobke | 2014-07-04 | 1 | -1/+10 |
| | | | | |||||
| * | | | use icon-confirm instead of text for accepting remote share, works better ↵ | Jan-Christoph Borchardt | 2014-07-04 | 3 | -8/+26 |
| | | | | | | | | | | | | | | | | with translations | ||||
* | | | | Merge pull request #9432 from owncloud/share-preview | Morris Jobke | 2014-07-04 | 2 | -5/+10 |
|\ \ \ \ | |_|/ / |/| | | | Return and use isPreviewAvailable for share previews | ||||
| * | | | Return and use isPreviewAvailable for share previews | Vincent Petry | 2014-07-04 | 2 | -5/+10 |
|/ / / | | | | | | | | | | | | | Since the mime type is known, now isPreviewAvailable is returned as well and used by the JS side to properly render mime icon and previews. | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-04 | 329 | -5719/+5442 |
| | | | |||||
* | | | fix version number - @karlitschek ;) | Morris Jobke | 2014-07-04 | 1 | -1/+1 |
| |/ |/| | |||||
* | | master if 8.0 pre alpha now | Frank Karlitschek | 2014-07-03 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #9410 from owncloud/shareownernamewidth | Jan-Christoph Borchardt | 2014-07-03 | 2 | -2/+129 |
|\ | | | | | Improved remote share owner display | ||||
| * | Improved remote share owner display | Vincent Petry | 2014-07-03 | 2 | -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_names | Vincent Petry | 2014-07-03 | 1 | -2/+2 |
|\ \ | | | | | | | fix hook names | ||||
| * | | fix hook names | Bjoern Schiessle | 2014-07-03 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #9402 from owncloud/sharing_improved_dialog | Vincent Petry | 2014-07-03 | 1 | -6/+2 |
|\ \ \ | | | | | | | | | only show message if default expire date is enforced | ||||
| * | | | only show message if default expire date is enforced | Bjoern Schiessle | 2014-07-03 | 1 | -6/+2 |
| |/ / | |||||
* | | | Merge pull request #9408 from owncloud/redirectconsolelogfix | Vincent Petry | 2014-07-03 | 1 | -1/+0 |
|\ \ \ | | | | | | | | | Remove forgotten debug log | ||||
| * | | | Remove forgotten debug log | Vincent Petry | 2014-07-03 | 1 | -1/+0 |
| | |/ | |/| | |||||
* | | | Merge pull request #9420 from owncloud/trashbin-hidesummarysize | Morris Jobke | 2014-07-03 | 1 | -0/+3 |
|\ \ \ | | | | | | | | | Hide the size in the trashbin summary row | ||||
| * | | | Hide the size in the trashbin summary row | Vincent Petry | 2014-07-03 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | This also fixes the extra spacing that appearing on the right of the table. | ||||
* | | | | Merge pull request #9407 from owncloud/fix-share-logo | Morris Jobke | 2014-07-03 | 2 | -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 mobile | Jan-Christoph Borchardt | 2014-07-03 | 2 | -1/+9 |
| |/ / | |||||
* | | | Merge pull request #9403 from owncloud/design-fix-fileslistbottom | Morris Jobke | 2014-07-03 | 2 | -3/+7 |
|\ \ \ | | | | | | | | | Fix bottom of files list, add proper space to have room for dropdowns | ||||
| * | | | reduce file list bottom whitespace a bit | Jan-Christoph Borchardt | 2014-07-03 | 1 | -1/+1 |
| | | | | |||||
| * | | | fix left margin of file list summary | Jan-Christoph Borchardt | 2014-07-03 | 2 | -1/+5 |
| | | | | |||||
| * | | | add whitespace to bottom of Files list – more obvious it's the end, and ↵ | Jan-Christoph Borchardt | 2014-07-03 | 1 | -2/+2 |
| |/ / | | | | | | | | | | space for share dropdown | ||||
* | | | Merge pull request #9394 from owncloud/design-fix-rename | Jan-Christoph Borchardt | 2014-07-03 | 1 | -4/+5 |
|\ \ \ | | | | | | | | | fix position of rename function, and text size | ||||
| * | | | fix checkbox shifting when rename input appears | Jan-Christoph Borchardt | 2014-07-03 | 1 | -0/+2 |
| | | | | |||||
| * | | | fix position of rename function, and text size | Jan-Christoph Borchardt | 2014-07-03 | 1 | -4/+3 |
| | | | | |||||
* | | | | Merge pull request #9390 from owncloud/fix-9368 | Jan-Christoph Borchardt | 2014-07-03 | 1 | -2/+0 |
|\ \ \ \ | |_|/ / |/| | | | Revert 'hides table header while users load.' | ||||
| * | | | Revert "hides table header while users load." | Arthur Schiwon | 2014-07-02 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | This reverts commit 0dc12a3737127aad28be12f9417d2a63601a88ff. | ||||
* | | | | Merge pull request #9384 from owncloud/eventsrc-fixfallbackwhenclosed | Morris Jobke | 2014-07-03 | 1 | -12/+23 |
|\ \ \ \ | |_|_|/ |/| | | | Fixed event source fallback after close | ||||
| * | | | Fix JSHint errors in EventSource class | Vincent Petry | 2014-07-02 | 1 | -13/+18 |
| | | | | |||||
| * | | | Fixed event source fallback after close | Vincent Petry | 2014-07-02 | 1 | -0/+6 |
| | | | | |||||
* | | | | Merge pull request #9391 from owncloud/design-mobile-share | Jan-Christoph Borchardt | 2014-07-03 | 4 | -5/+14 |
|\ \ \ \ | | | | | | | | | | | Fix mobile share view glitches | ||||
| * | | | | use same logo for mobile as for when logged in, fix #9360 | Jan-Christoph Borchardt | 2014-07-02 | 1 | -2/+4 |
| | | | | | |||||
| * | | | | hide text of download button, only show icon | Jan-Christoph Borchardt | 2014-07-02 | 2 | -1/+6 |
| | | | | | |||||
| * | | | | shared view: remove whitespace glitch on right | Jan-Christoph Borchardt | 2014-07-02 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | fix position of shared file buttons | Jan-Christoph Borchardt | 2014-07-02 | 1 | -1/+3 |
| | |/ / | |/| | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-03 | 391 | -11492/+13531 |
| |_|/ |/| | | |||||
* | | | Merge pull request #9389 from owncloud/fix-nametext-height | Jan-Christoph Borchardt | 2014-07-03 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | fix nametext height, was higher than the row | ||||
| * | | | fix nametext height, was higher than the row | Jan-Christoph Borchardt | 2014-07-02 | 1 | -0/+1 |
| |/ / | |||||
* | | | Merge pull request #9365 from owncloud/design-controls-polish | Jan-Christoph Borchardt | 2014-07-03 | 2 | -2/+4 |
|\ \ \ | | | | | | | | | Design controls polish |