summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #2394 from nextcloud/use-displayname-for-sharee-viewJoas Schilling2016-11-292-3/+5
|\ \ \ \ \ \
| * | | | | | fix testsMorris Jobke2016-11-291-1/+2
| * | | | | | Use displaynameJohn Molakvoæ2016-11-291-2/+3
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #2393 from nextcloud/fix-tabheaders-floatingMorris Jobke2016-11-291-0/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix floating of tabHeader itemsJulius Haertl2016-11-291-0/+2
| |/ / / /
* | | | | Merge pull request #2389 from nextcloud/fix-ellipsis-breadcrumbRoeland Jago Douma2016-11-291-0/+3
|\ \ \ \ \
| * | | | | Fix ellipsis in breadcrumb fix #2387John Molakvoæ (skjnldsv)2016-11-291-0/+3
| |/ / / /
* | | | | Merge pull request #2396 from nextcloud/use-correct-channelRoeland Jago Douma2016-11-293-10/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use correct channel informationMorris Jobke2016-11-293-10/+2
|/ / / /
* | | | [tx-robot] updated from transifexNextcloud bot2016-11-29144-1550/+1648
* | | | Merge pull request #2386 from nextcloud/fix-iphone-and-ipadChristoph Wurst2016-11-291-2/+4
|\ \ \ \
| * | | | Fix Regex for iPhone and add iPadLukas Reschke2016-11-281-2/+4
* | | | | Merge pull request #2383 from nextcloud/add-icon-for-remote-share-notificationsRoeland Jago Douma2016-11-282-5/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add an icon to the federated sharing notificationJoas Schilling2016-11-282-5/+9
* | | | | Merge pull request #2237 from nextcloud/rich-strings-and-icons-for-mention-no...blizzz2016-11-283-32/+107
|\ \ \ \ \
| * | | | | Adjust testsJoas Schilling2016-11-231-18/+56
| * | | | | Use the comment icon for the notificationsJoas Schilling2016-11-232-1/+2
| * | | | | Set the rich object string for comment notificationsJoas Schilling2016-11-231-13/+49
* | | | | | Merge pull request #2375 from Morlinest/patch-1Lukas Reschke2016-11-281-0/+1
|\ \ \ \ \ \
| * | | | | | Mark all content in search fieldMorlinest2016-11-281-0/+1
* | | | | | | Merge pull request #2380 from nextcloud/make-it-beta-2Lukas Reschke2016-11-281-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Increase version to Beta 2Lukas Reschke2016-11-281-2/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #2378 from nextcloud/fix-preview-image_srcMorris Jobke2016-11-281-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix image_src linkLukas Reschke2016-11-281-1/+1
| |/ / / / /
* | | | | | Merge pull request #2335 from nextcloud/grouping-for-activitiesMorris Jobke2016-11-285-109/+412
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add an event merger and use it for the files activitiesJoas Schilling2016-11-255-1/+344
| * | | | | Working towards groupsJoas Schilling2016-11-251-108/+68
* | | | | | Merge pull request #2342 from nextcloud/filepicker-shadowLukas Reschke2016-11-284-44/+30
|\ \ \ \ \ \
| * | | | | | move more sizing logic to cssRobin Appelman2016-11-284-22/+15
| * | | | | | fix dialog to window using cssRobin Appelman2016-11-282-12/+4
| * | | | | | center dialog using cssRobin Appelman2016-11-282-2/+3
| * | | | | | limit filepicker height to screenRobin Appelman2016-11-251-8/+1
| * | | | | | fix styling of filepicker dialogRobin Appelman2016-11-253-8/+15
| |/ / / / /
* | | | | | Merge pull request #2367 from nextcloud/issue-2349-keep-filemtime-for-zip-dow...Joas Schilling2016-11-282-5/+15
|\ \ \ \ \ \
| * | | | | | Add doc block for $timeJoas Schilling2016-11-281-0/+1
| * | | | | | Keep the filemtime for files when downloading them in a zip/tarJoas Schilling2016-11-282-5/+14
* | | | | | | Merge pull request #2351 from nextcloud/remember-session-defaultLukas Reschke2016-11-282-4/+44
|\ \ \ \ \ \ \
| * | | | | | | fix parameter orderChristoph Wurst2016-11-281-1/+1
| * | | | | | | do not remember session tokens by defaultChristoph Wurst2016-11-272-4/+44
* | | | | | | | Merge pull request #2353 from nextcloud/renew-session-token-rememberLukas Reschke2016-11-282-1/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | copy remember-me value when renewing a session tokenChristoph Wurst2016-11-272-1/+12
| |/ / / / / / /
* | | | | | | | Merge pull request #2341 from nextcloud/filepicker-public-shareLukas Reschke2016-11-281-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | use public share fileclient when availableRobin Appelman2016-11-251-1/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #2363 from nextcloud/fix-2329Morris Jobke2016-11-281-3/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | open popup menu in share dialog only for one sharee on renderArthur Schiwon2016-11-281-3/+7
* | | | | | | | | Merge pull request #2365 from nextcloud/resize-the-controls-after-the-sidebar...Lukas Reschke2016-11-281-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make sure the controls is resized after the sidebar disappearedJoas Schilling2016-11-281-1/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #2336 from nextcloud/fix-share-by-mail-permissionsBjörn Schießle2016-11-282-8/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | bring back permissions for mail sharesBjoern Schiessle2016-11-282-8/+7
* | | | | | | | | | Merge pull request #2366 from nextcloud/phpdoc-hintexceptionBjörn Schießle2016-11-281-0/+32
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |