Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/dev' into dev | Andrew Manning | 2017-01-01 | 5 | -6/+15 |
|\ | |||||
| * | better fix for #629 #635 based on ownership/authorship rather than message ↵ | zotlabs | 2016-12-31 | 1 | -11/+6 |
| | | | | | | | | flags which could be forged | ||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-12-31 | 1 | -1/+1 |
| |\ | |||||
| | * | fix expand-aside button hiding if aside is empty | Mario Vavti | 2016-12-31 | 1 | -1/+1 |
| | | | |||||
| * | | issues #629, #635 - edited post arriving from downstream source was not ↵ | zotlabs | 2016-12-31 | 1 | -0/+14 |
| |/ | | | | | | | being rejected | ||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-12-30 | 4 | -13/+5 |
| |\ | |||||
| | * | prevent eventual double scrollbar | Mario Vavti | 2016-12-30 | 1 | -2/+2 |
| | | | |||||
| * | | peoplefind widget should honour directory option settings (such as this site ↵ | zotlabs | 2016-12-30 | 2 | -1/+1 |
| | | | | | | | | | | | | only). | ||||
* | | | Reorganized and revised Zot Protocol content. Deleted some of the old pages ↵ | Andrew Manning | 2016-12-30 | 10 | -479/+368 |
| |/ |/| | | | | | that have been refactored. | ||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-12-30 | 2 | -2/+20 |
|\| | |||||
| * | move api version call back to core | zotlabs | 2016-12-30 | 1 | -0/+18 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-12-30 | 16 | -805/+1801 |
| |\ | |||||
| * | | logger typos | zotlabs | 2016-12-30 | 1 | -2/+2 |
| | | | |||||
* | | | css fixes and get rid of a javascript workaround | Mario Vavti | 2016-12-30 | 3 | -11/+3 |
| |/ |/| | |||||
* | | update fullcalendar to version 3.1 | Mario Vavti | 2016-12-30 | 10 | -724/+1461 |
| | | |||||
* | | Merge pull request #633 from anaqreon/dev | zotlabs | 2016-12-29 | 3 | -109/+102 |
|\ \ | | | | | | | Doco | ||||
| * \ | Merge remote-tracking branch 'upstream/dev' into dev | Andrew Manning | 2016-12-28 | 0 | -0/+0 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #632 from anaqreon/dev | zotlabs | 2016-12-29 | 2 | -48/+113 |
|\ \ \ | | | | | | | | | Zot structures doco integrated into the Zot page. | ||||
| | * | | Split Zot protocol and API into two pages. Revise text to add detail and ↵ | Andrew Manning | 2016-12-28 | 3 | -109/+102 |
| |/ / | | | | | | | | | | improve presentation. | ||||
| * / | Zot structures doco integrated into the Zot page. Added nowrap option to ↵ | Andrew Manning | 2016-12-28 | 2 | -48/+113 |
|/ / | | | | | | | [code] BBcode tag. | ||||
* | | Merge pull request #631 from anaqreon/dev | zotlabs | 2016-12-28 | 3 | -3/+204 |
|\ \ | |/ |/| | Add webpage doco to Member guide. Add nav menu highlighting when scro… | ||||
| * | Add webpage doco to Member guide. Add nav menu highlighting when scrolling ↵ | Andrew Manning | 2016-12-27 | 3 | -3/+204 |
|/ | | | | past content | ||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-12-27 | 2 | -112/+190 |
|\ | |||||
| * | Merge pull request #630 from anaqreon/dev | Andrew Manning | 2016-12-27 | 2 | -112/+190 |
| |\ | | | | | | | BBcode reference page is essentially complete. | ||||
| | * | Revert parseIdentityAwareHTML() | Andrew Manning | 2016-12-27 | 1 | -1/+1 |
| | | | |||||
| | * | Revert parseIdentityAwareHTML() | Andrew Manning | 2016-12-27 | 1 | -0/+1 |
| | | | |||||
| | * | BBcode reference page is essentially complete. There is still room for ↵ | Andrew Manning | 2016-12-27 | 3 | -113/+190 |
| |/ | | | | | | | improvement. | ||||
* | | issue with HTML in code blocks in markdown in wiki | zotlabs | 2016-12-27 | 1 | -1/+27 |
| | | |||||
* | | minor cleanup | zotlabs | 2016-12-26 | 1 | -6/+3 |
|/ | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-12-26 | 6 | -124/+276 |
|\ | |||||
| * | Merge pull request #628 from anaqreon/dev | zotlabs | 2016-12-27 | 6 | -124/+276 |
| |\ | | | | | | | Doco revisions | ||||
| | * | Almost completed reconstruction of bbcode reference page | Andrew Manning | 2016-12-26 | 3 | -60/+194 |
| | | | |||||
| | * | Updated markup language support doco. Modified parseIdentityAwareHTML BBcode ↵ | Andrew Manning | 2016-12-26 | 4 | -30/+48 |
| | | | | | | | | | | | | parsing to support the BBcode reference which is now in /help/member/bbcode.html. Add Bootstrap classes to tables for BBcode tables that have the border=0 or border=1 options set. | ||||
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Andrew Manning | 2016-12-26 | 2 | -5/+24 |
| | |\ | | |/ | |/| | |||||
| | * | Fix broken link | Andrew Manning | 2016-12-25 | 1 | -1/+1 |
| | | | |||||
* | | | perform input validation on xchan_store and re-enable the post method of the ↵ | zotlabs | 2016-12-26 | 2 | -2/+10 |
|/ / | | | | | | | xchan api endpoint. | ||||
* | | create first webpage as 'home' if none exist. | zotlabs | 2016-12-25 | 1 | -1/+5 |
| | | |||||
* | | show webpages link to visitors if a 'home' page exists. This means the nav ↵ | zotlabs | 2016-12-25 | 1 | -4/+19 |
|/ | | | | menu must be used to edit pages. | ||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-12-24 | 1 | -2/+2 |
|\ | |||||
| * | update changelog | Mario Vavti | 2016-12-23 | 1 | -2/+2 |
| | | |||||
* | | issue with post signatures if posted from api and logged in locally with a ↵ | zotlabs | 2016-12-24 | 2 | -3364/+3405 |
|/ | | | | different identity. | ||||
* | Merge pull request #627 from anaqreon/dev | zotlabs | 2016-12-23 | 4 | -285/+258 |
|\ | | | | | Merging proposed changes to 2.0RC for doco revisions | ||||
| * | Merging proposed changes to 2.0RC for doco revisions | Andrew Manning | 2016-12-22 | 4 | -285/+258 |
|/ | |||||
* | move style info into css file | Mario Vavti | 2016-12-22 | 4 | -43/+39 |
| | |||||
* | another check | Mario Vavti | 2016-12-22 | 1 | -3/+5 |
| | |||||
* | a cleaner way to work around browser bugs | Mario Vavti | 2016-12-22 | 1 | -7/+4 |
| | |||||
* | more robust crossbrowser support | Mario Vavti | 2016-12-22 | 3 | -3/+26 |
| | |||||
* | provide separate logging (if configured) for btlogger which is used to catch ↵ | zotlabs | 2016-12-21 | 3 | -1/+31 |
| | | | | really subtle issues which don't always leave an audit trail. Similar to dbfail.out, the file btlogger.out (if it exists and is write-able) will only log these unusual situations with backtraces so we can find the culprits. | ||||
* | update util/hz to use zot api instead of the (now optional) twitter api | zotlabs | 2016-12-21 | 1 | -1/+1 |
| | |||||
* | more vcard work | zotlabs | 2016-12-21 | 8 | -5/+18 |
| |