aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into oauth2Andrew Manning2018-03-313-1/+6
|\
| * Hubzilla issue #1022 - improve the usabilityzotlabs2018-03-301-3/+1
| * Hubzilla issue #1022 - provide a way to share wiki pages. Currently this is o...zotlabs2018-03-301-0/+3
| * allow case independence of replacements as well as patternszotlabs2018-03-301-1/+1
| * use context methodzotlabs2018-03-281-0/+1
| * put vcard widget with author of top-level post on display pagezotlabs2018-03-271-0/+3
* | Merge branch 'dev' into oauth2Andrew Manning2018-03-2718-15476/+24437
|\|
| * Update hmessages.pogoofy-bz2018-03-231-6/+6
| * Update translations for catalan (ca/ca_ES) from transifexfadelkon2018-03-236-6966/+11194
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-171-3/+3
| |\
| | * slight re-org and update of documentation, moving the tutorial to the top.zotlabs2018-03-161-3/+3
| * | use transform to scale emojis. this prevents text jumping on hoverMario Vavti2018-03-161-2/+3
| |/
| * indicate that there are events today in notifications by changing the badge c...Mario Vavti2018-03-141-0/+8
| * make the oneway-overlay slightly opaqueMario Vavti2018-03-141-0/+1
| * reveal the profile name field only if multi prifiles feature is enabledMario Vavti2018-03-141-2/+6
| * show site registration notifications setting only to site adminMario Vavti2018-03-141-1/+3
| * Merge pull request #1000 from mrjive/devgit-marijus2018-03-133-8483/+13200
| |\
| | * Merge pull request #18 from redmatrix/devmrjive2018-03-13100-3022/+4060
| | |\
| | * | small work on connections pagemrjive2018-03-131-1/+1
| | * | Partial italina translationhmessages.po hstrings.phpmrjive2018-03-052-8482/+13199
| * | | Merge pull request #999 from mjfriaza/devgit-marijus2018-03-132-9/+9
| |\ \ \ | | |_|/ | |/| |
| | * | Spanish translation: adapted the new timeago's stuffManuel Jiménez Friaza2018-03-132-9/+9
| * | | Merge pull request #997 from mjfriaza/devgit-marijus2018-03-132-5/+5
| |\| |
| | * | Spanish translation: added el before artículo, which is the correct construc...Manuel Jiménez Friaza2018-03-112-5/+5
* | | | Merge branch 'dev' into oauth2Andrew Manning2018-03-121-1/+1
|\| | |
| * | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-121-1/+1
| |\ \ \
| | * | | trim expects error ... in admin/sitezotlabs2018-03-101-1/+1
* | | | | Merge branch 'dev' into oauth2Andrew Manning2018-03-1012-191/+245
|\| | | |
| * | | | Merge pull request #994 from Reylak/devgit-marijus2018-03-091-15/+30
| |\ \ \ \
| | * | | | Uniformize title input with other input fieldsMathieu "Matbac" Bacou2018-03-081-0/+4
| | * | | | Remove useless background spec for category fieldMathieu "Matbac" Bacou2018-03-081-1/+0
| | * | | | Fix background of tags fieldMathieu "Matbac" Bacou2018-03-081-15/+23
| | * | | | Fix code background in wiki pagesMathieu "Thrar" Bacou2018-03-081-0/+4
| * | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-092-2/+2
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | notifications-btn-1 does not actually require the text-white class and this i...zotlabs2018-03-082-2/+2
| * | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-081-1/+15
| |\| | |
| | * | | hashtag autocompletezotlabs2018-03-071-1/+15
| * | | | we need the javascript in the template since strings are involvedMario Vavti2018-03-074-162/+169
| * | | | more bootstrap accordion fixesMario Vavti2018-03-072-10/+10
| * | | | we do not support separate mobile themes anymoreMario Vavti2018-03-071-1/+1
| |/ / /
| * | | Improve rendering of Readme files in plugin settingsAndrew Manning2018-03-051-0/+18
* | | | Merge branch 'dev' into oauth2Andrew Manning2018-03-056-1468/+1809
|\| | |
| * | | add pdl file for mod moderateMario Vavti2018-03-051-0/+4
| * | | fix javascript error if there are no notificationsMario Vavti2018-03-051-2/+1
| * | | update redbasic theme screenshotMario Vavti2018-03-052-0/+0
| * | | Update DE translation stringsphellmes2018-03-052-1466/+1804
* | | | Merge branch 'dev' into oauth2Andrew Manning2018-03-0466-1438/+1860
|\| | |
| * | | add dummy f= arg to suggestion urls, use directory version of suggest for new...zotlabs2018-03-031-1/+1
| * | | There was no pdl for mod_thing; add one because it's only a link away from pr...zotlabs2018-03-031-0/+7
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-03-023-1412/+1748
| |\ \ \