Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #2394 from nextcloud/use-displayname-for-sharee-view | Joas Schilling | 2016-11-29 | 2 | -3/+5 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | fix tests | Morris Jobke | 2016-11-29 | 1 | -1/+2 | |
| * | | | | | | Use displayname | John Molakvoæ | 2016-11-29 | 1 | -2/+3 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #2393 from nextcloud/fix-tabheaders-floating | Morris Jobke | 2016-11-29 | 1 | -0/+2 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Fix floating of tabHeader items | Julius Haertl | 2016-11-29 | 1 | -0/+2 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #2389 from nextcloud/fix-ellipsis-breadcrumb | Roeland Jago Douma | 2016-11-29 | 1 | -0/+3 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix ellipsis in breadcrumb fix #2387 | John Molakvoæ (skjnldsv) | 2016-11-29 | 1 | -0/+3 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #2396 from nextcloud/use-correct-channel | Roeland Jago Douma | 2016-11-29 | 3 | -10/+2 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Use correct channel information | Morris Jobke | 2016-11-29 | 3 | -10/+2 | |
|/ / / / | ||||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-11-29 | 144 | -1550/+1648 | |
* | | | | Merge pull request #2386 from nextcloud/fix-iphone-and-ipad | Christoph Wurst | 2016-11-29 | 1 | -2/+4 | |
|\ \ \ \ | ||||||
| * | | | | Fix Regex for iPhone and add iPad | Lukas Reschke | 2016-11-28 | 1 | -2/+4 | |
* | | | | | Merge pull request #2383 from nextcloud/add-icon-for-remote-share-notifications | Roeland Jago Douma | 2016-11-28 | 2 | -5/+9 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Add an icon to the federated sharing notification | Joas Schilling | 2016-11-28 | 2 | -5/+9 | |
* | | | | | Merge pull request #2237 from nextcloud/rich-strings-and-icons-for-mention-no... | blizzz | 2016-11-28 | 3 | -32/+107 | |
|\ \ \ \ \ | ||||||
| * | | | | | Adjust tests | Joas Schilling | 2016-11-23 | 1 | -18/+56 | |
| * | | | | | Use the comment icon for the notifications | Joas Schilling | 2016-11-23 | 2 | -1/+2 | |
| * | | | | | Set the rich object string for comment notifications | Joas Schilling | 2016-11-23 | 1 | -13/+49 | |
* | | | | | | Merge pull request #2375 from Morlinest/patch-1 | Lukas Reschke | 2016-11-28 | 1 | -0/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Mark all content in search field | Morlinest | 2016-11-28 | 1 | -0/+1 | |
* | | | | | | | Merge pull request #2380 from nextcloud/make-it-beta-2 | Lukas Reschke | 2016-11-28 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Increase version to Beta 2 | Lukas Reschke | 2016-11-28 | 1 | -2/+2 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #2378 from nextcloud/fix-preview-image_src | Morris Jobke | 2016-11-28 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Fix image_src link | Lukas Reschke | 2016-11-28 | 1 | -1/+1 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #2335 from nextcloud/grouping-for-activities | Morris Jobke | 2016-11-28 | 5 | -109/+412 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Add an event merger and use it for the files activities | Joas Schilling | 2016-11-25 | 5 | -1/+344 | |
| * | | | | | Working towards groups | Joas Schilling | 2016-11-25 | 1 | -108/+68 | |
* | | | | | | Merge pull request #2342 from nextcloud/filepicker-shadow | Lukas Reschke | 2016-11-28 | 4 | -44/+30 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | move more sizing logic to css | Robin Appelman | 2016-11-28 | 4 | -22/+15 | |
| * | | | | | | fix dialog to window using css | Robin Appelman | 2016-11-28 | 2 | -12/+4 | |
| * | | | | | | center dialog using css | Robin Appelman | 2016-11-28 | 2 | -2/+3 | |
| * | | | | | | limit filepicker height to screen | Robin Appelman | 2016-11-25 | 1 | -8/+1 | |
| * | | | | | | fix styling of filepicker dialog | Robin Appelman | 2016-11-25 | 3 | -8/+15 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #2367 from nextcloud/issue-2349-keep-filemtime-for-zip-dow... | Joas Schilling | 2016-11-28 | 2 | -5/+15 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Add doc block for $time | Joas Schilling | 2016-11-28 | 1 | -0/+1 | |
| * | | | | | | Keep the filemtime for files when downloading them in a zip/tar | Joas Schilling | 2016-11-28 | 2 | -5/+14 | |
* | | | | | | | Merge pull request #2351 from nextcloud/remember-session-default | Lukas Reschke | 2016-11-28 | 2 | -4/+44 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | fix parameter order | Christoph Wurst | 2016-11-28 | 1 | -1/+1 | |
| * | | | | | | | do not remember session tokens by default | Christoph Wurst | 2016-11-27 | 2 | -4/+44 | |
* | | | | | | | | Merge pull request #2353 from nextcloud/renew-session-token-remember | Lukas Reschke | 2016-11-28 | 2 | -1/+12 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | copy remember-me value when renewing a session token | Christoph Wurst | 2016-11-27 | 2 | -1/+12 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #2341 from nextcloud/filepicker-public-share | Lukas Reschke | 2016-11-28 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | use public share fileclient when available | Robin Appelman | 2016-11-25 | 1 | -1/+1 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #2363 from nextcloud/fix-2329 | Morris Jobke | 2016-11-28 | 1 | -3/+7 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | open popup menu in share dialog only for one sharee on render | Arthur Schiwon | 2016-11-28 | 1 | -3/+7 | |
* | | | | | | | | | Merge pull request #2365 from nextcloud/resize-the-controls-after-the-sidebar... | Lukas Reschke | 2016-11-28 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Make sure the controls is resized after the sidebar disappeared | Joas Schilling | 2016-11-28 | 1 | -1/+1 | |
| | |_|_|/ / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #2336 from nextcloud/fix-share-by-mail-permissions | Björn Schießle | 2016-11-28 | 2 | -8/+7 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | bring back permissions for mail shares | Bjoern Schiessle | 2016-11-28 | 2 | -8/+7 | |
* | | | | | | | | | | Merge pull request #2366 from nextcloud/phpdoc-hintexception | Björn Schießle | 2016-11-28 | 1 | -0/+32 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | |