harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,351 Commits 6 Branches 36 Tags
709bcedbed5f93b2b61e5a22d4fa72ea7742b239
Commit Graph

18351 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zotlabs 709bcedbed Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-12-31 13:39:40 -08:00
zotlabs 444e938e2d issues #629, #635 - edited post arriving from downstream source was not being rejected 2016-12-31 13:38:19 -08:00
Mario Vavti 9820baf82e fix expand-aside button hiding if aside is empty 2016-12-31 12:55:10 +01:00
zotlabs e5a6c0a94d Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-12-30 13:12:56 -08:00
zotlabs a9c8d4a216 peoplefind widget should honour directory option settings (such as this site only). 2016-12-30 13:09:35 -08:00
Mario Vavti 6c7da13cd3 prevent eventual double scrollbar 2016-12-30 20:50:12 +01:00
Mario Vavti 74d69bdedc Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2016-12-30 13:35:59 +01:00
Mario Vavti 8a074dedb6 css fixes and get rid of a javascript workaround 2016-12-30 13:35:43 +01:00
zotlabs 2e2254371a move api version call back to core 2016-12-30 02:45:16 -08:00
zotlabs 693f7366a2 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-12-30 02:36:24 -08:00
zotlabs e8a2ad4315 logger typos 2016-12-30 02:31:53 -08:00
Mario Vavti c9cbd2f4f6 update fullcalendar to version 3.1 2016-12-30 10:18:05 +01:00
zotlabs 90a99fc221 Merge pull request #633 from anaqreon/dev 
Doco
 2016-12-29 14:52:01 +11:00
Andrew Manning a649c3b72e Merge remote-tracking branch 'upstream/dev' into dev 2016-12-28 19:41:09 -05:00
Andrew Manning caec5d81eb Split Zot protocol and API into two pages. Revise text to add detail and improve presentation. 2016-12-28 19:40:53 -05:00
zotlabs e4ec976a1f Merge pull request #632 from anaqreon/dev 
Zot structures doco integrated into the Zot page.
 2016-12-29 07:13:53 +11:00
Andrew Manning 13768fdb9b Zot structures doco integrated into the Zot page. Added nowrap option to [code] BBcode tag. 2016-12-28 14:58:25 -05:00
zotlabs 46e4bd5fe0 Merge pull request #631 from anaqreon/dev 
Add webpage doco to Member guide. Add nav menu highlighting when scro…
 2016-12-28 12:03:59 +11:00
Andrew Manning 95683c6239 Add webpage doco to Member guide. Add nav menu highlighting when scrolling past content 2016-12-27 19:57:53 -05:00
zotlabs d29bd4b054 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-12-27 15:27:38 -08:00
zotlabs 17b7042a25 issue with HTML in code blocks in markdown in wiki 2016-12-27 15:26:47 -08:00
Andrew Manning 75afb37987 Merge pull request #630 from anaqreon/dev 
BBcode reference page is essentially complete.
 2016-12-27 07:37:13 -05:00
Andrew Manning 528a66fc97 Revert parseIdentityAwareHTML() 2016-12-27 07:35:33 -05:00
Andrew Manning b245311a7e Revert parseIdentityAwareHTML() 2016-12-27 07:34:47 -05:00
Andrew Manning 4b2ef39648 BBcode reference page is essentially complete. There is still room for improvement. 2016-12-27 07:32:39 -05:00
zotlabs 286c3eafe3 minor cleanup 2016-12-26 14:17:40 -08:00
zotlabs 3bb6c667db Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-12-26 13:11:54 -08:00
zotlabs b530d1d449 perform input validation on xchan_store and re-enable the post method of the xchan api endpoint. 2016-12-26 13:10:24 -08:00
zotlabs fdbb5b67a8 Merge pull request #628 from anaqreon/dev 
Doco revisions
 2016-12-27 07:29:57 +11:00
Andrew Manning 67f09fb1d6 Almost completed reconstruction of bbcode reference page 2016-12-26 14:59:18 -05:00
Andrew Manning 1a5dd5c87c Updated markup language support doco. Modified parseIdentityAwareHTML BBcode 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. 2016-12-26 08:58:40 -05:00
Andrew Manning c2a189ab18 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2016-12-26 06:52:56 -05:00
zotlabs 56219f9f61 create first webpage as 'home' if none exist. 2016-12-25 14:40:50 -08:00
zotlabs c38e7ee3e3 show webpages link to visitors if a 'home' page exists. This means the nav menu must be used to edit pages. 2016-12-25 14:26:27 -08:00
Andrew Manning 5e490ed8b7 Fix broken link 2016-12-25 12:59:34 -05:00
zotlabs 9f9b1d3ce6 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-12-24 15:02:03 -08:00
zotlabs 35ed9b9b72 issue with post signatures if posted from api and logged in locally with a different identity. 2016-12-24 15:00:37 -08:00
Mario Vavti 4ab2d46113 update changelog 2016-12-23 10:07:12 +01:00
zotlabs 1e53528363 Merge pull request #627 from anaqreon/dev 
Merging proposed changes to 2.0RC for doco revisions
 2016-12-23 15:35:12 +11:00
Andrew Manning 5d8334d7f4 Merging proposed changes to 2.0RC for doco revisions 2016-12-22 21:49:16 -05:00
Mario Vavti 3629468d47 move style info into css file 2016-12-22 15:20:02 +01:00
Mario Vavti c5d6f58988 another check 2016-12-22 15:01:29 +01:00
Mario Vavti 6cb527a937 a cleaner way to work around browser bugs 2016-12-22 14:55:05 +01:00
Mario Vavti 2ce6d47519 more robust crossbrowser support 2016-12-22 11:54:04 +01:00
zotlabs f2bfdfdedd provide separate logging (if configured) for btlogger which is used to catch 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. 2016-12-21 23:35:54 -08:00
zotlabs 9d49faca61 update util/hz to use zot api instead of the (now optional) twitter api 2016-12-21 16:44:33 -08:00
zotlabs bb85e139f1 more vcard work 2016-12-21 15:03:33 -08:00
Mario Vavti fcc92299eb css fixes 2016-12-21 12:55:49 +01:00
Mario Vavti 04472bd730 fix a glitch in sticky-kit and comment out alt_pager() in widget_conversations since it will not work there 2016-12-21 11:51:24 +01:00
Mario Vavti e91a4bebed update changelog 2016-12-21 10:15:14 +01:00