Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #18609 from owncloud/login-layout | Lukas Reschke | 2015-08-27 | 4 | -12/+64 |
|\ | | | | | log in screen improvement & simplification | ||||
| * | use simpler logo for log in page | Jan-Christoph Borchardt | 2015-08-27 | 1 | -1/+3 |
| | | |||||
| * | position and style remember button on log in page | Jan-Christoph Borchardt | 2015-08-27 | 1 | -2/+4 |
| | | |||||
| * | show feedback spinner for log in process | Jan-Christoph Borchardt | 2015-08-27 | 2 | -1/+26 |
| | | |||||
| * | move log in button into fields and use icon instead of text | Jan-Christoph Borchardt | 2015-08-27 | 2 | -8/+31 |
| | | |||||
* | | Merge pull request #18608 from owncloud/filetype-icons | Morris Jobke | 2015-08-27 | 67 | -1852/+69 |
|\ \ | |/ |/| | simpler style for filetype icons | ||||
| * | simpler style for filetype icons | Jan-Christoph Borchardt | 2015-08-27 | 67 | -1852/+69 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-08-27 | 22 | -8/+122 |
| | | |||||
* | | Merge pull request #18574 from owncloud/update-eventsource-errors | Robin McCorkell | 2015-08-27 | 1 | -6/+20 |
|\ \ | | | | | | | Properly show update exception in web UI | ||||
| * | | Properly show update exception | Vincent Petry | 2015-08-26 | 1 | -1/+7 |
| | | | |||||
| * | | Properly show token errors in ajax/update.php event source | Vincent Petry | 2015-08-26 | 1 | -5/+13 |
| | | | |||||
* | | | Merge pull request #18582 from owncloud/be-consistent | Thomas Müller | 2015-08-26 | 1 | -2/+2 |
|\ \ \ | |_|/ |/| | | Remove last occurence of `forcessl` | ||||
| * | | Remove last occurence of `forcessl` | Lukas Reschke | 2015-08-26 | 1 | -2/+2 |
| | | | | | | | | | | | | This shoudl have been adjusted as well, now it's consistent with `setMagicInCookie`. While it does not have a security impact directly some automated scanners reported this all the time. | ||||
* | | | Merge pull request #18587 from owncloud/list-highlight | Vincent Petry | 2015-08-26 | 1 | -15/+15 |
|\ \ \ | | | | | | | | | reduce grey tones to one for list highlight | ||||
| * | | | reduce grey tones to one for list highlight | Jan-Christoph Borchardt | 2015-08-26 | 1 | -15/+15 |
|/ / / | |||||
* | | | Merge pull request #18514 from owncloud/app-navigation-style | Morris Jobke | 2015-08-26 | 15 | -35/+30 |
|\ \ \ | | | | | | | | | reduce grey tones in app navigation | ||||
| * | | | reduce grey tones in app navigation, bubble menu and scrollbar | Jan-Christoph Borchardt | 2015-08-26 | 15 | -35/+30 |
|/ / / | |||||
* | | | Merge pull request #18573 from owncloud/search-style | Jan-Christoph Borchardt | 2015-08-26 | 3 | -30/+14 |
|\ \ \ | | | | | | | | | only show search icon on desktop, like on mobile | ||||
| * | | | only show search icon on desktop, like on mobile | Jan-Christoph Borchardt | 2015-08-26 | 3 | -30/+14 |
| | |/ | |/| | |||||
* | | | Merge pull request #18577 from owncloud/action-details | Morris Jobke | 2015-08-26 | 6 | -59/+75 |
|\ \ \ | |_|/ |/| | | file action detail style fixes | ||||
| * | | fix unit tests | Morris Jobke | 2015-08-26 | 2 | -10/+10 |
| | | | |||||
| * | | properly shade file actions and menu items, don't differentiate between ↵ | Jan-Christoph Borchardt | 2015-08-26 | 3 | -31/+56 |
| | | | | | | | | | | | | mobile and desktop | ||||
| * | | fix share icons of shared items being placed off on mobile | Jan-Christoph Borchardt | 2015-08-26 | 1 | -2/+2 |
| | | | |||||
| * | | remove border around bubble menu | Jan-Christoph Borchardt | 2015-08-26 | 1 | -12/+1 |
| | | | |||||
| * | | proper padding and whitespace for share and more actions | Jan-Christoph Borchardt | 2015-08-26 | 2 | -6/+9 |
| | | | |||||
| * | | use same font-size for share action text | Jan-Christoph Borchardt | 2015-08-26 | 1 | -1/+0 |
| |/ | |||||
* | | Merge pull request #18580 from owncloud/remove-unused-translations-master | Morris Jobke | 2015-08-26 | 190 | -2206/+24 |
|\ \ | | | | | | | Remove unused translations master | ||||
| * | | Adding simple script to remove language files from core | Thomas Müller | 2015-08-26 | 1 | -0/+24 |
| | | | |||||
| * | | Remove languages which are no longer maintained on transifex | Thomas Müller | 2015-08-26 | 189 | -2206/+0 |
|/ / | |||||
* | | Merge pull request #18042 from GreenArchon/master | Morris Jobke | 2015-08-26 | 2 | -7/+35 |
|\ \ | | | | | | | Properly nest groups when using memberOf to detect group membership, … | ||||
| * | | fix more review comments for #18042 / #17759 | Frédéric Fortier | 2015-08-07 | 1 | -4/+3 |
| | | | |||||
| * | | Take review comments into consideration for pr #18042 / issue #17759 | Frédéric Fortier | 2015-08-04 | 1 | -16/+13 |
| | | | |||||
| * | | Properly nest groups when using memberOf to detect group membership, fixes ↵ | Frédéric Fortier | 2015-08-03 | 2 | -7/+39 |
| | | | | | | | | | | | | #17759 | ||||
* | | | Merge pull request #18576 from owncloud/update-maintenance-color | Jan-Christoph Borchardt | 2015-08-26 | 1 | -1/+0 |
|\ \ \ | | | | | | | | | Make maintenance/update text white | ||||
| * | | | Make maintenance/update text white | Vincent Petry | 2015-08-26 | 1 | -1/+0 |
| | |/ | |/| | | | | | | | | | | Removing the color makes it default to white as defined in the parent style. | ||||
* / | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-08-26 | 58 | -6/+656 |
|/ / | |||||
* | | Merge pull request #18569 from owncloud/files-dropdown-border | Raghu Nayyar | 2015-08-26 | 1 | -1/+1 |
|\ \ | | | | | | | adjust dropdown borders to button borders | ||||
| * | | adjust dropdown borders to button borders | Christoph Wurst | 2015-08-25 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #18553 from owncloud/write-l10n-on-login | Thomas Müller | 2015-08-26 | 1 | -4/+12 |
|\ \ \ | | | | | | | | | Save detected l10n of browser on login | ||||
| * | | | Save detected l10n of browser on login | Morris Jobke | 2015-08-25 | 1 | -4/+12 |
| | | | | | | | | | | | | | | | | * fixes owncloud/activity#373 | ||||
* | | | | Merge pull request #17662 from owncloud/locking-db | Thomas Müller | 2015-08-26 | 10 | -43/+446 |
|\ \ \ \ | | | | | | | | | | | Database backend for locking | ||||
| * | | | | Adding path to log message | Thomas Müller | 2015-08-25 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | log a warning while trying to acquire a db lock from within a transaction | Robin Appelman | 2015-08-10 | 3 | -6/+18 |
| | | | | | |||||
| * | | | | add method to check if we're inside a transaction | Robin Appelman | 2015-08-10 | 3 | -0/+27 |
| | | | | | |||||
| * | | | | cleanup empty locks | Robin Appelman | 2015-08-10 | 1 | -0/+14 |
| | | | | | |||||
| * | | | | more phpdoc | Robin Appelman | 2015-08-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | more phpdoc | Robin Appelman | 2015-08-03 | 1 | -1/+9 |
| | | | | | |||||
| * | | | | rename path field to key | Robin Appelman | 2015-08-03 | 2 | -12/+18 |
| | | | | | |||||
| * | | | | initialize unused (for now) ttl field to 0 | Robin Appelman | 2015-08-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix db schema | Robin Appelman | 2015-08-03 | 5 | -12/+44 |
| | | | | |