aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/dev' into devAndrew Manning2017-01-010-0/+0
|\
| * Merge pull request #634 from anaqreon/devAndrew Manning2017-01-0132-1650/+647
| |\
* | | Add guest access token section to member guide with screenshot of settingsAndrew Manning2017-01-013-4/+17
| |/ |/|
* | Deleted old versions that have been integrated. Integrated and slightly revis...Andrew Manning2017-01-0122-1171/+279
* | Merge remote-tracking branch 'upstream/dev' into devAndrew Manning2017-01-015-6/+15
|\|
| * better fix for #629 #635 based on ownership/authorship rather than message fl...zotlabs2016-12-311-11/+6
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-12-311-1/+1
| |\
| | * fix expand-aside button hiding if aside is emptyMario Vavti2016-12-311-1/+1
| * | issues #629, #635 - edited post arriving from downstream source was not being...zotlabs2016-12-311-0/+14
| |/
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-12-304-13/+5
| |\
| | * prevent eventual double scrollbarMario Vavti2016-12-301-2/+2
| * | peoplefind widget should honour directory option settings (such as this site ...zotlabs2016-12-302-1/+1
* | | Reorganized and revised Zot Protocol content. Deleted some of the old pages t...Andrew Manning2016-12-3010-479/+368
| |/ |/|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-12-302-2/+20
|\|
| * move api version call back to corezotlabs2016-12-301-0/+18
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-12-3016-805/+1801
| |\
| * | logger typoszotlabs2016-12-301-2/+2
* | | css fixes and get rid of a javascript workaroundMario Vavti2016-12-303-11/+3
| |/ |/|
* | update fullcalendar to version 3.1Mario Vavti2016-12-3010-724/+1461
* | Merge pull request #633 from anaqreon/devzotlabs2016-12-293-109/+102
|\ \
| * \ Merge remote-tracking branch 'upstream/dev' into devAndrew Manning2016-12-280-0/+0
| |\ \ | |/ / |/| |
* | | Merge pull request #632 from anaqreon/devzotlabs2016-12-292-48/+113
|\ \ \
| | * | Split Zot protocol and API into two pages. Revise text to add detail and impr...Andrew Manning2016-12-283-109/+102
| |/ /
| * / Zot structures doco integrated into the Zot page. Added nowrap option to [cod...Andrew Manning2016-12-282-48/+113
|/ /
* | Merge pull request #631 from anaqreon/devzotlabs2016-12-283-3/+204
|\ \ | |/ |/|
| * Add webpage doco to Member guide. Add nav menu highlighting when scrolling pa...Andrew Manning2016-12-273-3/+204
|/
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-12-272-112/+190
|\
| * Merge pull request #630 from anaqreon/devAndrew Manning2016-12-272-112/+190
| |\
| | * Revert parseIdentityAwareHTML()Andrew Manning2016-12-271-1/+1
| | * Revert parseIdentityAwareHTML()Andrew Manning2016-12-271-0/+1
| | * BBcode reference page is essentially complete. There is still room for improv...Andrew Manning2016-12-273-113/+190
| |/
* | issue with HTML in code blocks in markdown in wikizotlabs2016-12-271-1/+27
* | minor cleanupzotlabs2016-12-261-6/+3
|/
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-12-266-124/+276
|\
| * Merge pull request #628 from anaqreon/devzotlabs2016-12-276-124/+276
| |\
| | * Almost completed reconstruction of bbcode reference pageAndrew Manning2016-12-263-60/+194
| | * Updated markup language support doco. Modified parseIdentityAwareHTML BBcode ...Andrew Manning2016-12-264-30/+48
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devAndrew Manning2016-12-262-5/+24
| | |\ | | |/ | |/|
| | * Fix broken linkAndrew Manning2016-12-251-1/+1
* | | perform input validation on xchan_store and re-enable the post method of the ...zotlabs2016-12-262-2/+10
|/ /
* | create first webpage as 'home' if none exist.zotlabs2016-12-251-1/+5
* | show webpages link to visitors if a 'home' page exists. This means the nav me...zotlabs2016-12-251-4/+19
|/
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-12-241-2/+2
|\
| * update changelogMario Vavti2016-12-231-2/+2
* | issue with post signatures if posted from api and logged in locally with a di...zotlabs2016-12-242-3364/+3405
|/
* Merge pull request #627 from anaqreon/devzotlabs2016-12-234-285/+258
|\
| * Merging proposed changes to 2.0RC for doco revisionsAndrew Manning2016-12-224-285/+258
|/
* move style info into css fileMario Vavti2016-12-224-43/+39
* another checkMario Vavti2016-12-221-3/+5
* a cleaner way to work around browser bugsMario Vavti2016-12-221-7/+4
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 09:08:42 +0000