Commit Graph

24488 Commits

Author SHA1 Message Date
redmatrix 0cb5f009b4 tag_deliver of an edit to an already uplinked item wasn't resetting permissions and ownership bits before starting delivery chain on the edit. 2015-11-15 20:52:50 -08:00
redmatrix c7b2ec8bba allow plugins to also log to a different named logfile and also alter the log message 2015-11-15 19:40:01 -08:00
redmatrix 12b0a9f35f add logger plugin hook 2015-11-15 19:37:26 -08:00
redmatrix fff30b1c3d permission issues editing wall-to-wall posts 2015-11-15 19:36:17 -08:00
redmatrix 6ad35e3d84 issue with dead hub detection 2015-11-15 18:12:53 -08:00
redmatrix 3d80073a0e revert html in markdown for posts, but trim the input before processing the markdown 2015-11-15 18:03:37 -08:00
redmatrix 959c3ba89d Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-11-15 17:29:07 -08:00
redmatrix 1029939f56 issues connecting to local forum 2015-11-15 17:28:45 -08:00
Haakon Meland Eriksen fd5d1416d9 Merge remote-tracking branch 'upstream/master' 2015-11-15 00:27:23 +01:00
jeroenpraat def5edf93c nl+es and some other bits 2015-11-14 20:43:34 +01:00
Haakon Meland Eriksen 6bdde985ce Merge remote-tracking branch 'upstream/master' 2015-11-14 08:32:37 +01:00
redmatrix dba38821bc superblock enhancements 2015-11-13 15:28:34 -08:00
Haakon Meland Eriksen 9d6a4c1d05 Reorder buttons HME 2015-11-13 19:44:42 +01:00
Haakon Meland Eriksen 94bef08f15 Adding original jot.tpl from GitHub 2015-11-13 18:32:25 +01:00
Haakon Meland Eriksen 0178840c19 Merge remote-tracking branch 'upstream/master' 2015-11-13 16:45:31 +01:00
Haakon Meland Eriksen d04c73ae00 Reorder buttons 2015-11-13 16:31:48 +01:00
Haakon Meland Eriksen 495f21c08c Reverted changes - got white screen 2015-11-13 07:36:32 +01:00
Haakon Meland Eriksen d238cbea19 Regrouped post buttons 2015-11-13 07:03:30 +01:00
redmatrix 5d0646c9e1 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-11-12 20:23:17 -08:00
redmatrix 93e5449c08 really basic photo album widget for content regions 2015-11-12 20:22:36 -08:00
ken restivo 4872a30e2b Add note about base64 and urlencode. 2015-11-12 18:02:20 -08:00
ken restivo f5fcdf1de4 Fix spelling of documentation. 2015-11-12 17:53:26 -08:00
redmatrix 888bf76e4b allow pdl content 2015-11-12 17:47:38 -08:00
redmatrix 22a650ade8 issue #154 2015-11-12 16:57:02 -08:00
redmatrix 391807b46c small fixes, removed old unused database row, and log more prominently a missing directory server URL 2015-11-12 16:45:38 -08:00
Haakon Meland Eriksen 921a2e0dc4 Regrouped post buttons 2015-11-13 00:07:09 +01:00
jeroenpraat 5afe8e5aa1 Small update to Bluegrid and generic-content-wrapper-styled to dreport 2015-11-12 22:10:20 +01:00
Haakon Meland Eriksen ba84d6ff7c Regrouped post buttons 2015-11-12 21:11:47 +01:00
Haakon Meland Eriksen d786502f19 Regrouped post buttons 2015-11-12 20:44:41 +01:00
Haakon Meland Eriksen 63063450b3 Merge remote-tracking branch 'upstream/master' 2015-11-12 07:46:29 +01:00
Haakon Meland Eriksen 90463ee67d Make upload and encrypt easier on phones by editing jot.tpl 2015-11-12 07:45:37 +01:00
redmatrix 6e04dd96a1 will also need api doco 2015-11-11 20:51:15 -08:00
redmatrix f7c837aad0 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-11-11 15:13:01 -08:00
redmatrix bd3d323849 run markdown through html purifier for those who insist on mixing html with markdown. 2015-11-11 15:09:22 -08:00
Haakon Meland Eriksen e26b558e53 Promoted upload of images and encryption 2015-11-11 23:55:05 +01:00
Haakon Meland Eriksen 85e5cd7f98 Rearranged comment buttons back 2015-11-11 23:43:41 +01:00
Haakon Meland Eriksen 1d8cac6e73 Rearranged comment buttons 2015-11-11 23:31:18 +01:00
redmatrix 52f6bd03b7 Merge pull request #149 from waitman/master
updates to Postgres schema
2015-11-12 09:07:26 +11:00
ken restivo 75c10eaff5 Merge pull request #144 from kenrestivo/api-auth-fix
api_auth.php must be included since the function moved.
2015-11-11 11:18:41 -08:00
mrjive 53a796afcc Merge pull request #8 from redmatrix/master
get fresh code from HZ base
2015-11-11 16:51:48 +01:00
Waitman Gobble f94a8698dd updates to Postgres schema 2015-11-11 07:42:41 -08:00
ken restivo ffb8059c24 api_auth.php must be included since the function moved. 2015-11-11 02:26:12 -08:00
redmatrix bc7c0ed844 Merge pull request #143 from kenrestivo/allow-importing-by-proxy
Bust out import_account() into a separate function
2015-11-11 19:42:52 +11:00
redmatrix ac9250fc4a Merge pull request #141 from HaakonME/master
Added Hubzilla plugin repo for ownMapp - decentralized and private map sharing
2015-11-11 18:08:19 +11:00
redmatrix f1492945ec Merge pull request #140 from kenrestivo/move-export-to-plugin
Moving this out into a plugin; hopefully one that will work with RM
2015-11-11 18:08:03 +11:00
ken restivo 10ccdbacba Bust out import_account() into a separate function to allow importing accounts by proxy, i.e. for admins to import a channel on behalf of a user. 2015-11-10 23:07:28 -08:00
redmatrix d683573402 Merge pull request #142 from kenrestivo/refactor-out-api-auth
Move api_auth() out to a file that can be included from plugins/modules
2015-11-11 18:01:48 +11:00
ken restivo ddce0412ac Move api_auth() out to a file that can be included from plugins/modules to allow them to expose their own programmatic API. 2015-11-10 22:50:18 -08:00
Haakon Meland Eriksen 609e42cdd8 Merge remote-tracking branch 'upstream/master' 2015-11-11 07:26:15 +01:00
redmatrix 7235c20854 Merge https://github.com/redmatrix/hubzilla into pending_merge 0.11 2015-11-10 19:03:03 -08:00