aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | fix embed image for text/bbcodeMario Vavti2016-12-021-0/+5
* | fallback directory servers need to be in the same realmzotlabs2016-12-011-3/+1
* | upgraded zotlabs.com to httpszotlabs2016-12-011-1/+1
* | bb_highlight: if somebody enters an unsupported language for code syntax high...zotlabs2016-12-011-3/+3
* | sql error in fetch conversationzotlabs2016-12-011-1/+1
* | trim both key and iv on other cipherszotlabs2016-12-011-0/+2
* | trim iv in STD_encapsulatezotlabs2016-12-012-0/+3
* | versioning for permission additions to ensure we're using the same set of fileszotlabs2016-12-013-0/+14
* | extensible perms: the really, really hard part - figuring out what to do abou...zotlabs2016-12-013-10/+69
* | compatible_project: we are only concerned with the default realmzotlabs2016-12-011-0/+4
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-12-012-267/+262
|\ \
| * | use highlight in ac-list for hl bbcodeMario Vavti2016-12-011-1/+2
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-12-013-4/+4
| |\ \
| * | | whitespace fixesMario Vavti2016-12-011-266/+260
* | | | allow plugins to cancel item_store() and item_store_update()zotlabs2016-12-011-0/+11
| |/ / |/| |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-12-012-50/+48
|\| |
| * | more wiki cleanupMario Vavti2016-12-012-7/+6
| * | wiki cleanup - wip. please watch out for eventual regressionsMario Vavti2016-12-012-45/+44
* | | issue #607 parens not recognised inside urlszotlabs2016-12-013-4/+4
|/ /
* | issue #606, postgres binary data handling under PDO and HHVM when passed nullzotlabs2016-11-301-1/+1
* | Merge pull request #605 from anaqreon/docozotlabs2016-12-019-114/+558
|\ \
| * | Add resources and links. Fix bug where table of contents was not generated if...Andrew Manning2016-11-302-1/+8
| * | Reverted governance to previous version accidentally clobbered. Removed histo...Andrew Manning2016-11-301-241/+92
| * | Added some vertical offset to headings so that the table of contents links do...Andrew Manning2016-11-303-1/+19
| * | Merge remote-tracking branch 'upstream/dev' into docoAndrew Manning2016-11-3018-211/+410
| |\ \ | |/ / |/| |
* | | advanced crypto restricted by server rolezotlabs2016-11-302-0/+6
* | | zot 1.2zotlabs2016-11-3011-169/+307
* | | 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
|\ \ \
| * \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-11-301-13/+13
| |\ \ \
| * | | | 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-305-26/+79
| |/ / / |/| | |
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-11-309-84/+96
|\| | |
| * | | provide role on siteinfo pagezotlabs2016-11-291-1/+1
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-11-291-1/+1
|\ \ \ \
* | | | | rename functionMario Vavti2016-11-291-13/+13
| | | * | Merge remote-tracking branch 'upstream/dev' into docoAndrew Manning2016-11-2916-806/+840
| | | |\ \ | | | |/ / | | |/| |
| | * | | This isn't the most elegant solution as it requires a bit of arcane knowledge...zotlabs2016-11-293-6/+9
| | * | | wrong linkzotlabs2016-11-291-1/+1
| | * | | provide a fresh new look and cleaner layout and more relevant information to ...zotlabs2016-11-295-78/+81
| | * | | highlightzotlabs2016-11-292-1/+7
| |/ / /
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-11-293-39/+50
| |\ \ \ | |/ / / |/| | |
* | | | more work on wiki mimetypesMario Vavti2016-11-292-31/+35
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-11-294-682/+693
|\ \ \ \
* | | | | some basic work for implementing mimetypes for wikisMario Vavti2016-11-283-9/+16
| | * | | missed this from the earlier checkinzotlabs2016-11-291-1/+1
| |/ / /
| * | | roll standard version to ensure that dba_pdo is the default and make this a d...zotlabs2016-11-281-1/+1
| * | | minor re-arrangezotlabs2016-11-281-4/+4
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-11-2852-97/+2005
| |\ \ \ | |/ / / |/| | |
| * | | connedit prev/next: sort in the db.zotlabs2016-11-262-677/+688