summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2405 from nextcloud/add-avatar-job-onceRoeland Jago Douma2016-11-302-9/+17
|\
| * Execute MoveAvatars repair step only onceMorris Jobke2016-11-292-9/+17
* | Merge pull request #1446 from nextcloud/fix-mail-designMorris Jobke2016-11-309-66/+10
|\ \
| * | Fix minor mail issuesRoeland Jago Douma2016-11-302-2/+2
| * | Remove leftovers from #1929Morris Jobke2016-11-302-51/+0
| * | Update sharedbymail templateMorris Jobke2016-11-301-3/+2
| * | Fix mail header logo [fixes #1326]Felix Epp2016-11-306-12/+8
| |/
* | Merge pull request #2152 from nextcloud/preview_cleanupjobMorris Jobke2016-11-306-0/+583
|\ \
| * | Add test if repair step is already doneRoeland Jago Douma2016-11-193-6/+59
| * | Adds background job to cleanup all previews.Roeland Jago Douma2016-11-196-0/+530
* | | Merge pull request #2414 from nextcloud/version_previewsLukas Reschke2016-11-304-11/+56
|\ \ \
| * | | Fix js testsRoeland Jago Douma2016-11-292-11/+11
| * | | Show mimeicon when versions don't have a previewRoeland Jago Douma2016-11-293-3/+48
* | | | Merge pull request #2409 from nextcloud/fix-1470Roeland Jago Douma2016-11-301-8/+11
|\ \ \ \
| * | | | log exception about user not present on LDAP on login only if loglevel is set...Arthur Schiwon2016-11-291-8/+11
* | | | | Merge pull request #2105 from nextcloud/focus-tags-input-on-toggleRoeland Jago Douma2016-11-301-2/+3
|\ \ \ \ \
| * | | | | Focus the input after clicking the "Tags" labelJoas Schilling2016-11-141-2/+3
* | | | | | [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 #2408John Molakvoæ2016-11-291-1/+1
* | | | | | | [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 mobileMorris Jobke2016-11-291-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | [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 urlChristoph Wurst2016-11-093-8/+8
* | | | | | Merge pull request #2388 from nextcloud/share-table-ellipsisMorris Jobke2016-11-293-10/+8
|\ \ \ \ \ \
| * | | | | | Fix mobile viewJohn Molakvoæ (skjnldsv)2016-11-291-5/+0
| * | | | | | Fix username widthJohn Molakvoæ (skjnldsv)2016-11-291-1/+2
| * | | | | | Fix #2384John Molakvoæ (skjnldsv)2016-11-292-5/+7
* | | | | | | Merge pull request #2404 from nextcloud/streamresponse-warningJoas Schilling2016-11-291-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | prevent warning in StreamResponseRobin Appelman2016-11-291-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | 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