Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into navigation | Jan-Christoph Borchardt | 2013-01-31 | 4 | -10/+15 |
|\ | |||||
| * | Merge pull request #1387 from schiesbn/visual_improvements | Thomas Müller | 2013-01-31 | 1 | -0/+1 |
| |\ | |||||
| | * | use the same tooltip as for the password field | Björn Schießle | 2013-01-31 | 1 | -0/+1 |
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-31 | 2 | -7/+10 |
| * | | Merge pull request #1358 from owncloud/button-fix | Jan-Christoph Borchardt | 2013-01-31 | 1 | -3/+4 |
| |\ \ | |||||
| | * | | no box-shadow for public share download button | Jan-Christoph Borchardt | 2013-01-31 | 1 | -1/+1 |
| | * | | change button box-shadow from hard white to slight transparent | Jan-Christoph Borchardt | 2013-01-31 | 1 | -2/+2 |
| | * | | increase opacity of buttons, fix for dark backgrounds like header in public s... | Jan-Christoph Borchardt | 2013-01-29 | 1 | -2/+3 |
* | | | | Merge branch 'master' into navigation | Jan-Christoph Borchardt | 2013-01-31 | 56 | -1/+88 |
|\| | | | |||||
| * | | | fix merge conflict | Björn Schießle | 2013-01-31 | 63 | -989/+1129 |
| |\ \ \ | |||||
| | * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-31 | 55 | -1/+88 |
| | | |/ | | |/| | |||||
| * | | | make background transparent | Björn Schießle | 2013-01-30 | 1 | -0/+0 |
| * | | | icons added; empty trash bin message added | Björn Schießle | 2013-01-29 | 1 | -0/+0 |
* | | | | increase opacity of inactive apps and settings entries for better visibility | Jan-Christoph Borchardt | 2013-01-31 | 1 | -3/+3 |
* | | | | vertical scrollbar for app navigation when too many apps | Jan-Christoph Borchardt | 2013-01-31 | 1 | -1/+6 |
* | | | | ellipsize long app names in navigation | Jan-Christoph Borchardt | 2013-01-31 | 1 | -0/+1 |
* | | | | Merge pull request #1359 from raghunayyar/navigation | Jan-Christoph Borchardt | 2013-01-31 | 1 | -0/+6 |
|\ \ \ \ | |||||
| * | | | | Reduced Styling and Image loads as from src and not backgorund. | raghunayyar | 2013-01-30 | 1 | -2/+3 |
| * | | | | No Image Repetition on Enabling Apps in Navigation Bar | raghunayyar | 2013-01-30 | 1 | -0/+5 |
* | | | | | use new user function to display real name if available, username still fallback | Jan-Christoph Borchardt | 2013-01-30 | 1 | -1/+1 |
* | | | | | Merge branch 'master' into navigation | Jan-Christoph Borchardt | 2013-01-30 | 55 | -963/+1018 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-30 | 15 | -1/+38 |
| * | | | | Merge pull request #1360 from owncloud/display_name | Lukas Reschke | 2013-01-29 | 3 | -19/+20 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | prevent xss | Björn Schießle | 2013-01-29 | 1 | -1/+1 |
| | * | | | search display name instead of uid; fix key/value order for array access | Björn Schießle | 2013-01-28 | 1 | -1/+1 |
| | * | | | use display name to show share_width and owner information | Björn Schießle | 2013-01-25 | 1 | -9/+9 |
| | * | | | show display name instead of uid | Björn Schießle | 2013-01-25 | 1 | -9/+10 |
| | * | | | add display name to title instead if login-ID | Björn Schießle | 2013-01-24 | 1 | -1/+1 |
| * | | | | Merge pull request #1324 from owncloud/permanent-share-icons | Michael Gapczynski | 2013-01-28 | 2 | -5/+22 |
| |\ \ \ \ | |||||
| | * | | | | Change file action text for files inside shared folders as well | Michael Gapczynski | 2013-01-28 | 1 | -0/+1 |
| | * | | | | Change file action text to 'Shared' | Michael Gapczynski | 2013-01-28 | 1 | -0/+3 |
| | * | | | | Merge branch 'master' into permanent-share-icons | Jan-Christoph Borchardt | 2013-01-28 | 11 | -109/+199 |
| | |\ \ \ \ | |||||
| | * | | | | | Permanently display shared status icons | Michael Gapczynski | 2013-01-26 | 2 | -5/+18 |
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-29 | 49 | -938/+938 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | merge styles | Jan-Christoph Borchardt | 2013-01-28 | 47 | -1335/+16456 |
|\| | | | | | |||||
| * | | | | | Merge branch 'master' into updater-CSP | Thomas Mueller | 2013-01-28 | 16 | -135/+277 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Merge pull request #1321 from owncloud/csp-fixes | Thomas Müller | 2013-01-28 | 1 | -3/+7 |
| | |\ \ \ \ | |||||
| | | * | | | | Fix undefined variable | Lukas Reschke | 2013-01-26 | 1 | -3/+7 |
| | | |/ / / | |||||
| | * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-28 | 1 | -0/+20 |
| | * | | | | Merge pull request #1326 from owncloud/event-source-token | Lukas Reschke | 2013-01-26 | 2 | -2/+1 |
| | |\ \ \ \ | |||||
| | | * | | | | Use global oc_requesttoken for Event Source | Michael Gapczynski | 2013-01-26 | 2 | -2/+1 |
| | | |/ / / | |||||
| | * / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-27 | 6 | -79/+148 |
| | |/ / / | |||||
| | * | | | Merge pull request #1059 from owncloud/fixing-998-master | Thomas Müller | 2013-01-26 | 3 | -11/+50 |
| | |\ \ \ | |||||
| | | * | | | update used space percent after each ajax call and display the notification | Thomas Mueller | 2013-01-19 | 1 | -2/+5 |
| | | * | | | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-18 | 67 | -361/+322 |
| | | |\ \ \ | |||||
| | | * | | | | pin notification to the top | Thomas Mueller | 2013-01-11 | 1 | -1/+1 |
| | | * | | | | fixing text-align on navigation menu - closing div was missing - THX Lukas | Thomas Mueller | 2013-01-11 | 1 | -1/+1 |
| | | * | | | | displaying notification now centered | Thomas Mueller | 2013-01-11 | 3 | -4/+8 |
| | | * | | | | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-11 | 21 | -124/+143 |
| | | |\ \ \ \ | |||||
| | | * | | | | | bring back L250 as spotted by @tanghus - THX | Thomas Mueller | 2013-01-08 | 1 | -0/+1 |