aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-12-011-13/+16
|\
| * more wiki cleanupMario Vavti2016-12-011-3/+1
| * wiki cleanup - wip. please watch out for eventual regressionsMario Vavti2016-12-011-10/+15
* | issue #607 parens not recognised inside urlszotlabs2016-12-012-3/+3
|/
* zot 1.2zotlabs2016-11-303-6/+10
* do not call purify_html() at this placeMario Vavti2016-11-301-2/+4
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-11-301-2/+2
|\
| * pubsites: don't list dead siteszotlabs2016-11-301-2/+2
* | go live with wiki mimetypes - you can now choose if a wiki will contain markd...Mario Vavti2016-11-301-17/+34
|/
* This isn't the most elegant solution as it requires a bit of arcane knowledge...zotlabs2016-11-292-1/+3
* wrong linkzotlabs2016-11-291-1/+1
* provide a fresh new look and cleaner layout and more relevant information to ...zotlabs2016-11-293-55/+42
* more work on wiki mimetypesMario Vavti2016-11-291-4/+5
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-11-291-6/+2
|\
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-11-282-2/+44
| |\
| * | connedit prev/next: sort in the db.zotlabs2016-11-261-6/+2
* | | some basic work for implementing mimetypes for wikisMario Vavti2016-11-281-4/+3
| |/ |/|
* | Merge pull request #602 from anaqreon/docogit-marijus2016-11-281-1/+32
|\ \
| * | Add ability to include page assets in documentation pages such as images. Upd...Andrew Manning2016-11-271-1/+32
* | | minor cleanup and remove more double encodingMario Vavti2016-11-281-1/+1
|/ /
* | Merge pull request #601 from anaqreon/wikigit-marijus2016-11-251-1/+12
|\ \ | |/ |/|
| * Make a git commit when a new page is created, recording who created the page.Andrew Manning2016-11-241-1/+12
* | prev-next navigation for mod_conneditzotlabs2016-11-241-3/+36
|/
* whitespace and minor fixesMario Vavti2016-11-231-1/+1
* silence headers already sent warning. issue #596Mario Vavti2016-11-231-6/+9
* whitespace and coding styleMario Vavti2016-11-231-8/+17
* whitespace cleanupMario Vavti2016-11-231-25/+25
* notification issuezotlabs2016-11-221-1/+1
* display wiki list on wiki landing page.Mario Vavti2016-11-221-18/+31
* redmatrix is no longer considered a supported platform and will not be listed...zotlabs2016-11-193-5/+11
* Hide all content if no wiki is selected except for a message saying to choose...Andrew Manning2016-11-181-2/+3
* Move page list back out to the side menu, but with the new page form below th...Andrew Manning2016-11-181-0/+1
* issue #588, change 'Bug Report' app to 'Report Bug'zotlabs2016-11-172-3/+3
* wiki: simplify permission model, reduce duplicate calls to get the same chann...zotlabs2016-11-151-115/+102
* Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-11-141-0/+4
|\
| * SECURITY: public calendar leaks connection information (birthdays) when view_...zotlabs2016-11-141-0/+4
* | Moved delete wiki button into new edit wiki form, opened by edit wiki icon in...Andrew Manning2016-11-141-1/+0
|/
* zidify wiki contentzotlabs2016-11-131-2/+2
* don't send notification for posts/comments on old conversations that were ref...zotlabs2016-11-121-0/+4
* Moved save to bottom. Created Wiki Tools dropdown to be consistent, moved pag...Andrew Manning2016-11-121-0/+2
* deprecate/remove get_channel_by_nick() which is just a less generalised varia...zotlabs2016-11-084-19/+24
* more api workzotlabs2016-11-081-5/+3
* more api re-orgzotlabs2016-11-081-2/+4
* a bit more background work to support private mail previewzotlabs2016-11-081-3/+17
* move twitter api to addon; there's still a bit of cleanup remaining, mostly d...zotlabs2016-11-081-1/+11
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-11-071-2/+2
|\
| * reverse logicMario Vavti2016-11-071-2/+2
* | cleanup and re-organise the voting and attendance buttonszotlabs2016-11-071-0/+4
|/
* provide /locs link on settings page if there is more than one hubloc for this...zotlabs2016-11-052-5/+1
* issue #576 - duplicate events shownzotlabs2016-11-022-4/+3