aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* grrr. stop making branding assumptions.zotlabs2017-03-126-13/+8
|
* more cleanupzotlabs2017-03-121-29/+35
|
* update std_versionzotlabs2017-03-121-1/+1
|
* db issueszotlabs2017-03-124-90/+8
|
* Merge branch 'dev' into redzotlabs2017-03-113-3/+27
|\
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-03-112-2/+26
| |\
| | * Login-box css-fix for Bluegrid schemejeroenpraat2017-03-111-1/+25
| | |
| | * Merge pull request #693 from anaqreon/devgit-marijus2017-03-111-1/+1
| | |\ | | | | | | | | Take me home instead of get me home
| | | * Take me home instead of get me homeAndrew Manning2017-03-091-1/+1
| | |/
| * | stringszotlabs2017-03-101-3838/+3824
| | |
| * | Monday is a proper name and should be capitalised (except in private ↵zotlabs2017-03-081-1/+1
| |/ | | | | | | conversation amongst unix geeks).
* | stringszotlabs2017-03-101-3838/+3824
| |
* | one role.zotlabs2017-03-094-61/+5
| |
* | more cleanupzotlabs2017-03-093-40/+5
| |
* | Merge branch 'dspr' into redzotlabs2017-03-0911-7395/+7326
|\ \
| * | move all the diaspora content hacks to the diaspora pluginzotlabs2017-03-081-408/+9
| | |
| * | DCV stuffzotlabs2017-03-071-20/+6
| |/
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-03-073-10/+10
| |\
| | * allow post_activity_item to be passed an empty ACL without resetting to ↵zotlabs2017-03-061-1/+2
| | | | | | | | | | | | channel default
| | * add public_policy to the nwiki container also. This should not affect the ↵zotlabs2017-03-061-0/+2
| | | | | | | | | | | | recent bug as presented, but is being added for consistency.
| | * correct fix for wiki anonymous read issue (items_permissions_sql checks ↵zotlabs2017-03-062-9/+6
| | | | | | | | | | | | item.public_policy which was set for posts, not wikis)
| * | Big 2.2 string update Dutchjeroenpraat2017-03-072-6864/+7305
| |/
| * allow unauthenticated access to public wiki pagesMario Vavti2017-03-061-2/+10
| |
| * do not collapse long nsfw contentMario Vavti2017-03-061-1/+1
| |
| * remove include/probe.php which has never completed development and has never ↵zotlabs2017-03-054-106/+1
| | | | | | | | been used
* | go back to where the problem startedzotlabs2017-03-092-600/+13
| |
* | Merge branch 'dev' into redzotlabs2017-03-051824-18/+2
|\|
| * move emoji emoticons (not reactions) to pluginzotlabs2017-03-051824-18/+2
| |
* | some event workzotlabs2017-03-052-0/+5
|/
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-03-0522-4756/+5247
|\
| * Merge pull request #689 from mjfriaza/devzotlabs2017-03-052-2329/+2378
| |\ | | | | | | Translated the last strings into Spanish version
| | * Translated the last strings into Spanish versionManuel Jiménez Friaza2017-03-052-2329/+2378
| | |
| * | Merge pull request #688 from dawnbreak/markdownzotlabs2017-03-0520-2427/+2869
| |\ \ | | | | | | | | :arrow_up: :hammer: Upgrade Markdownify library.
| | * | :arrow_up: :hammer: Upgrade Markdownify library.Klaus Weidenbach2017-03-0520-2427/+2869
| |/ / | | | | | | | | | | | | | | | | | | | | | The current version 2.0.0 (alpha) throws deprecated warning with PHP7.1 and PHPUnit. Upgrade the HTML to Markdown converter for PHP to the current Markdownify 2.2.1. Used composer to manage this library.
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-03-042-1/+2
|\| |
| * | update changelogMario Vavti2017-03-041-0/+1
| | |
| * | we need item edited for wiki page history, not item createdMario Vavti2017-03-041-1/+1
| | |
* | | minor feed issuezotlabs2017-03-041-0/+8
|/ /
* | string updatezotlabs2017-03-031-887/+910
| |
* | fix badge position for narrow navbarMario Vavti2017-03-031-4/+0
| |
* | reverse sort orderzotlabs2017-03-021-1/+1
| |
* | activity widget - turns out the owner is not relevant.zotlabs2017-03-021-9/+5
| |
* | document the activity widgetzotlabs2017-03-021-0/+1
| |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-03-029-28/+23
|\ \
| * | provide info if there are no sche,es availableMario Vavti2017-03-021-4/+9
| | |
| * | reset schema value after we empty and repopulate it. second half of fix for #624Mario Vavti2017-03-022-2/+2
| | |
| * | reset schema value after we empty and repopulate it. first half of fix for #624Mario Vavti2017-03-021-0/+2
| | |
| * | setting top position of contextual-help in schemes does not work with narrow ↵Mario Vavti2017-03-024-5/+0
| | | | | | | | | | | | navbar setting. schema css is always called last.
| * | add title to connect buttonMario Vavti2017-03-011-1/+1
| | |
| * | minor template fixesMario Vavti2017-03-013-19/+12
| | |