summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2016-11-3026-4/+162
|
* Merge pull request #2412 from nextcloud/filepicker-bottom-padding-fixChristoph Wurst2016-11-291-1/+1
|\ | | | | Fix #2408
| * Fix #2408John Molakvoæ2016-11-291-1/+1
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | [tx-robot] updated from transifexNextcloud bot2016-11-2950-46/+62
| |
* | Merge pull request #2410 from nextcloud/fix-mobile-textLukas Reschke2016-11-291-1/+1
|\ \ | | | | | | Fix missing text for downloads on mobile
| * | Fix missing text for downloads on mobileMorris Jobke2016-11-291-1/+1
| | | | | | | | | | | | | | | | | | * fixes #2362 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | [tx-robot] updated from transifexNextcloud bot2016-11-29110-3930/+3476
| |/ |/|
* | Merge pull request #2066 from nextcloud/fix-redirect-double-encodingMorris Jobke2016-11-293-8/+8
|\ \ | |/ |/| do not double encode the redirect url
| * do not double encode the redirect urlChristoph Wurst2016-11-093-8/+8
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #2388 from nextcloud/share-table-ellipsisMorris Jobke2016-11-293-10/+8
|\ \ | | | | | | Fix whitespace between sharee name and icons #2384
| * | Fix mobile viewJohn Molakvoæ (skjnldsv)2016-11-291-5/+0
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Fix username widthJohn Molakvoæ (skjnldsv)2016-11-291-1/+2
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Fix #2384John Molakvoæ (skjnldsv)2016-11-292-5/+7
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #2404 from nextcloud/streamresponse-warningJoas Schilling2016-11-291-1/+1
|\ \ \ | | | | | | | | prevent warning in StreamResponse
| * | | prevent warning in StreamResponseRobin Appelman2016-11-291-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #2394 from nextcloud/use-displayname-for-sharee-viewJoas Schilling2016-11-292-3/+5
|\ \ \ \ | | | | | | | | | | Use displayname instead of username for sharee view
| * | | | fix testsMorris Jobke2016-11-291-1/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Use displaynameJohn Molakvoæ2016-11-291-2/+3
| | |/ / | |/| | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #2393 from nextcloud/fix-tabheaders-floatingMorris Jobke2016-11-291-0/+2
|\ \ \ \ | |_|/ / |/| | | Fix floating of tabHeader items
| * | | Fix floating of tabHeader itemsJulius Haertl2016-11-291-0/+2
| |/ / | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* | | Merge pull request #2389 from nextcloud/fix-ellipsis-breadcrumbRoeland Jago Douma2016-11-291-0/+3
|\ \ \ | | | | | | | | Fix ellipsis breadcrumb
| * | | Fix ellipsis in breadcrumb fix #2387John Molakvoæ (skjnldsv)2016-11-291-0/+3
| |/ / | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #2396 from nextcloud/use-correct-channelRoeland Jago Douma2016-11-293-10/+2
|\ \ \ | |/ / |/| | Use correct channel information
| * | Use correct channel informationMorris Jobke2016-11-293-10/+2
|/ / | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [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 iPad
| * | Fix Regex for iPhone and add iPadLukas Reschke2016-11-281-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | The previous Regex worked for an iPhone with version "10.0" but not with "10.0.1" which was wrong. I modified the Regex to also match for those situations. I also added a Regex for the iPad Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | 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 notification
| * | Add an icon to the federated sharing notificationJoas Schilling2016-11-282-5/+9
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #2237 from ↵blizzz2016-11-283-32/+107
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/rich-strings-and-icons-for-mention-notifications Rich strings and icons for mention notifications
| * | | Adjust testsJoas Schilling2016-11-231-18/+56
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Use the comment icon for the notificationsJoas Schilling2016-11-232-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Set the rich object string for comment notificationsJoas Schilling2016-11-231-13/+49
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #2375 from Morlinest/patch-1Lukas Reschke2016-11-281-0/+1
|\ \ \ \ | | | | | | | | | | Mark all content in search field
| * | | | Mark all content in search fieldMorlinest2016-11-281-0/+1
| | | | | | | | | | | | | | | To resolve issue #2310
* | | | | Merge pull request #2380 from nextcloud/make-it-beta-2Lukas Reschke2016-11-281-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Increase version to Beta 2
| * | | | | Increase version to Beta 2Lukas Reschke2016-11-281-2/+2
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Just as a precaution already so we can easily ship this via the updater to the beta channel properly to Beta 1 users Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | Merge pull request #2378 from nextcloud/fix-preview-image_srcMorris Jobke2016-11-281-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Fix image_src link
| * | | | Fix image_src linkLukas Reschke2016-11-281-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | The link in the image_src link (used for previews on Social Media such as Facebook) was still using the old route. This changes it to use the new route. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | Merge pull request #2335 from nextcloud/grouping-for-activitiesMorris Jobke2016-11-285-109/+412
|\ \ \ \ | |/ / / |/| | | Bring back grouping for activities
| * | | Add an event merger and use it for the files activitiesJoas Schilling2016-11-255-1/+344
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Working towards groupsJoas Schilling2016-11-251-108/+68
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #2342 from nextcloud/filepicker-shadowLukas Reschke2016-11-284-44/+30
|\ \ \ \ | | | | | | | | | | Fix filepicker styling
| * | | | move more sizing logic to cssRobin Appelman2016-11-284-22/+15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | fix dialog to window using cssRobin Appelman2016-11-282-12/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | center dialog using cssRobin Appelman2016-11-282-2/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | limit filepicker height to screenRobin Appelman2016-11-251-8/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | fix styling of filepicker dialogRobin Appelman2016-11-253-8/+15
| |/ / / | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #2367 from ↵Joas Schilling2016-11-282-5/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/issue-2349-keep-filemtime-for-zip-downloads Keep the filemtime for files when downloading them in a zip/tar
| * | | | Add doc block for $timeJoas Schilling2016-11-281-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>