summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2406 from nextcloud/move-dav-activities-to-new-apiRoeland Jago Douma2016-11-302-2/+2
|\ | | | | Move dav activities to new api
| * Add viewbox to the iconsJoas Schilling2016-11-292-2/+2
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #1446 from nextcloud/fix-mail-designMorris Jobke2016-11-305-55/+2
|\ \ | | | | | | Fix mail design
| * | Remove leftovers from #1929Morris Jobke2016-11-302-51/+0
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Fix mail header logo [fixes #1326]Felix Epp2016-11-304-6/+4
| |/ | | | | | | Signed-off-by: Felix A. Epp <work@felixepp.de>
* | [tx-robot] updated from transifexNextcloud bot2016-11-302-0/+2
| |
* | Fix #2408John Molakvoæ2016-11-291-1/+1
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #2388 from nextcloud/share-table-ellipsisMorris Jobke2016-11-291-4/+6
|\ \ | |/ |/| Fix whitespace between sharee name and icons #2384
| * 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-291-4/+5
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | 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>
* / Fix ellipsis in breadcrumb fix #2387John Molakvoæ (skjnldsv)2016-11-291-0/+3
|/ | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* [tx-robot] updated from transifexNextcloud bot2016-11-294-0/+24
|
* Merge pull request #2237 from ↵blizzz2016-11-281-1/+1
|\ | | | | | | | | nextcloud/rich-strings-and-icons-for-mention-notifications Rich strings and icons for mention notifications
| * Use the comment icon for the notificationsJoas Schilling2016-11-231-1/+1
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Mark all content in search fieldMorlinest2016-11-281-0/+1
| | | | | | To resolve issue #2310
* | 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 #2341 from nextcloud/filepicker-public-shareLukas Reschke2016-11-281-1/+1
|\ \ \ | | | | | | | | use public share fileclient when available
| * | | use public share fileclient when availableRobin Appelman2016-11-251-1/+1
| |/ / | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #2363 from nextcloud/fix-2329Morris Jobke2016-11-281-3/+7
|\ \ \ | | | | | | | | open popup menu in share dialog only for one sharee on render
| * | | open popup menu in share dialog only for one sharee on renderArthur Schiwon2016-11-281-3/+7
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | Merge pull request #2365 from ↵Lukas Reschke2016-11-281-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/resize-the-controls-after-the-sidebar-slided-in Make sure the controls is resized after the sidebar disappeared
| * | | | Make sure the controls is resized after the sidebar disappearedJoas Schilling2016-11-281-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | bring back permissions for mail sharesBjoern Schiessle2016-11-281-8/+6
|/ / / / | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | [tx-robot] updated from transifexNextcloud bot2016-11-282-2/+2
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2016-11-282-2/+2
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2016-11-282-0/+2
| | |
* | | [tx-robot] updated from transifexNextcloud bot2016-11-276-0/+6
| | |
* | | [tx-robot] updated from transifexNextcloud bot2016-11-2644-44/+102
| | |
* | | Add jquery ui fixes js fileJohn Molakvoæ (skjnldsv)2016-11-252-0/+9
|/ / | | | | | | | | | | + fix autocomplete width (fix #2324) Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #2325 from nextcloud/fix-slogan-stylingLukas Reschke2016-11-251-5/+0
|\ \ | | | | | | Fix styling of slogan on login page for longer text
| * | Fix styling of slogan on login page for longer textJulius Haertl2016-11-251-5/+0
| | | | | | | | | | | | | | | | | | Fixes #851 Signed-off-by: Julius Haertl <jus@bitgrid.net>
* | | Add nextcloud_announcements to shipped.jsonLukas Reschke2016-11-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise on the update from beta1 to beta2 the app would be disabled again as incompatible: ``` root@cloud:/var/www/html# sudo -u www-data php occ upgrade Nextcloud or one of the apps require upgrade - only a limited number of commands are available You may use your browser or the occ upgrade command to do the upgrade Set log level to debug Turned on maintenance mode Updating database schema Updated database Disabled 3rd-party app: calendar Disabled 3rd-party app: contacts Disabled 3rd-party app: nextcloud_announcements Disabled 3rd-party app: spreed Update 3rd-party app: calendar Update 3rd-party app: contacts ``` Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #2243 from nextcloud/file-drop-wordingRoeland Jago Douma2016-11-241-1/+1
|\ \ \ | | | | | | | | fix wording of File drop, ref #2207
| * | | fix wording of File drop, ref #2207Jan-Christoph Borchardt2016-11-221-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | Merge pull request #2313 from nextcloud/fix-namingMorris Jobke2016-11-243-14/+14
|\ \ \ \ | | | | | | | | | | fix some outdated naming
| * | | | fix some outdated namingJan-Christoph Borchardt2016-11-243-14/+14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | Merge pull request #2309 from nextcloud/fix-faviconsLukas Reschke2016-11-243-3/+3
|\ \ \ \ \ | |/ / / / |/| | | | fix favicon viewbox, remove decimals
| * | | | fix favicon viewbox, remove decimalsJan-Christoph Borchardt2016-11-243-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | show dialog again of operation failedBjoern Schiessle2016-11-241-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | set focus on input fieldBjoern Schiessle2016-11-241-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>