Commit graph

15125 commits

Author SHA1 Message Date
Mario Vavti
e4145deeb7 some events refacturing 2015-11-18 23:50:42 +01:00
redmatrix
68da4d90dc fix admin plugin hooks 2015-11-17 20:44:57 -08:00
redmatrix
a089064588 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-11-17 15:04:04 -08:00
redmatrix
a06f7fbe2e photo album widget permissions issue 2015-11-17 15:03:27 -08:00
Mario Vavti
7c4d9519c8 whitespace 2015-11-17 23:08:35 +01:00
Mario Vavti
6fa0807550 more css fixes 2015-11-17 23:01:24 +01:00
Mario Vavti
868a0d8a90 missing closing " for src attribute 2015-11-17 13:45:00 +01:00
Mario Vavti
5079dff338 update bootstrap lib 3.3.4 -> 3.3.5 2015-11-17 11:39:47 +01:00
Mario Vavti
9e3d130ad9 css fixes 2015-11-17 11:32:37 +01:00
Mario Vavti
b531486dab show jotnets toggle button only if there are jotnets and whitespace fixes 2015-11-17 10:46:38 +01:00
redmatrix
6df98f080b fix api/direct_messages/new at least for the json case. We seem to have a missing template for XML 2015-11-16 19:17:39 -08:00
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
jeroenpraat
def5edf93c nl+es and some other bits 2015-11-14 20:43:34 +01:00
redmatrix
dba38821bc superblock enhancements 2015-11-13 15:28:34 -08: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
jeroenpraat
5afe8e5aa1 Small update to Bluegrid and generic-content-wrapper-styled to dreport 2015-11-12 22:10:20 +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
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
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 2015-11-10 19:03:03 -08:00
redmatrix
e7bedf4433 do a better job of preserving linebreaks in posts for channels that use markdown 2015-11-10 19:02:28 -08:00
Haakon Meland Eriksen
23d30ab2c5 Merge remote-tracking branch 'upstream/master' 2015-11-10 23:50:54 +01:00
ken restivo
741afeea41 Moving this out into a plugin; hopefully one that will work with Redmatrix as well. 2015-11-10 14:48:50 -08:00
redmatrix
cd989977b8 Merge pull request #139 from sasiflo/master
Replaced references to redmatrix logo.
2015-11-11 07:53:08 +11:00
sasiflo
1216508dc2 Replaced references to redmatrix logo. 2015-11-10 17:11:12 +01:00
Haakon Meland Eriksen
5c7dfcfe43 Fixed ownMapp repo address 2015-11-10 16:09:11 +01:00