Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | | | |||||
| * | | | | use the database backend for locking if no memcache is configured for it | Robin Appelman | 2015-08-03 | 1 | -4/+2 |
| | | | | | |||||
| * | | | | Add database backend for high level locking | Robin Appelman | 2015-08-03 | 5 | -2/+214 |
| | | | | | |||||
| * | | | | split off keeping track of acquire locks | Robin Appelman | 2015-08-03 | 3 | -36/+130 |
| | | | | | |||||
* | | | | | Merge pull request #18522 from owncloud/lighter-fonts | Morris Jobke | 2015-08-25 | 6 | -12/+13 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | move fonts from Regular+Bold to Light+Semibold for lighter feel | ||||
| * | | | | move fonts from Regular+Bold to Light+Semibold for lighter feel | Jan-Christoph Borchardt | 2015-08-25 | 6 | -12/+13 |
| | | | | | |||||
* | | | | | Merge pull request #18562 from owncloud/explicit-use-statuscode-200 | Morris Jobke | 2015-08-25 | 2 | -0/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | Explicitly specify status code 200 as response code | ||||
| * | | | | | Explicitly specify status code 200 as response code | Lukas Reschke | 2015-08-25 | 2 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | Potentially fixes https://github.com/owncloud/core/issues/17586 | ||||
* | | | | | | Merge pull request #18564 from owncloud/fix-transifex-sync | Morris Jobke | 2015-08-25 | 779 | -4815/+7273 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Update slug | ||||
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-08-25 | 778 | -4814/+7272 |
| | | | | | | | |||||
| * | | | | | | Update slug | Thomas Müller | 2015-08-25 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #18554 from owncloud/fix-gs-share-master | Morris Jobke | 2015-08-25 | 2 | -2/+13 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Simply hide sharing buttons for IE8 | ||||
| * | | | | | | don't load gs-share | Thomas Müller | 2015-08-25 | 1 | -2/+4 |
| | | | | | | | |||||
| * | | | | | | Simply hide sharing buttons for IE8 - fixes #18011 | Thomas Müller | 2015-08-25 | 2 | -0/+9 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #18558 from owncloud/ext-objectstore | Lukas Reschke | 2015-08-25 | 2 | -2/+16 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Prevent objectstore being set from client side | ||||
| * | | | | | Prevent objectstore being set from client side | Robin McCorkell | 2015-08-25 | 2 | -2/+16 |
| | | | | | | |||||
* | | | | | | Merge pull request #18506 from owncloud/round-avatars | Jan-Christoph Borchardt | 2015-08-25 | 1 | -0/+12 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | make profile photos round | ||||
| * | | | | | | make profile photos round | Jan-Christoph Borchardt | 2015-08-25 | 1 | -0/+12 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #18550 from owncloud/mobile-shared-style | Jan-Christoph Borchardt | 2015-08-25 | 2 | -7/+9 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | fix being able to distinguish shared items on mobile | ||||
| * | | | | | fix being able to distinguish shared items on mobile | Jan-Christoph Borchardt | 2015-08-25 | 2 | -7/+9 |
| |/ / / / |