Commit Graph

5523 Commits

Author SHA1 Message Date
Mario Vavti
0c163c4d03 Merge branch 'master' of https://github.com/redmatrix/hubzilla 2015-11-18 23:51:00 +01:00
Mario Vavti
e4145deeb7 some events refacturing 2015-11-18 23:50:42 +01:00
redmatrix
179730e485 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-11-18 02:45:39 -08:00
redmatrix
106b3257e4 wsod viewing photo widget 2015-11-18 02:45:22 -08:00
ken restivo
312cc415ce Pass in account_id. Required for bulk identity importer. 2015-11-18 00:26:18 -08: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
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
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
1029939f56 issues connecting to local forum 2015-11-15 17:28:45 -08:00
redmatrix
dba38821bc superblock enhancements 2015-11-13 15:28:34 -08:00
redmatrix
93e5449c08 really basic photo album widget for content regions 2015-11-12 20:22:36 -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
6e04dd96a1 will also need api doco 2015-11-11 20:51:15 -08: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
ken restivo
ffb8059c24 api_auth.php must be included since the function moved. 2015-11-11 02:26:12 -08: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
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
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
c4a3487f0c remove the obsolete avatar_img function (gravatar/libravatar lookup) 2015-11-09 20:29:36 -08:00
redmatrix
e6de9bfa4e get rid of the pre-comanche widget placement and wgl code 2015-11-09 19:42:37 -08:00
redmatrix
fba2603304 add avatars to likes/dislikes/etc. 2015-11-09 15:58:19 -08:00
redmatrix
862a310075 thwart attempts to use an external private directory as a directory server 2015-11-09 14:53:58 -08:00
ken restivo
49d6605377 First pass at endpoints for exporting users and channels in bulk as admin. 2015-11-08 20:50:36 -08:00
redmatrix
dfb49558f4 Merge pull request #132 from kenrestivo/test-for-email
Add unit tests for valid email function.
2015-11-09 14:39:00 +11:00
redmatrix
4e1c308162 make jotnets modal 2015-11-08 17:48:43 -08:00
redmatrix
5c2692a8ea no comment permission bug, also implement delete() in RedDirectory per Waitman 2015-11-08 16:36:36 -08:00
ken restivo
9c240de303 Add unit tests for valid email function. 2015-11-08 14:37:48 -08:00
redmatrix
4620eb32d2 version and string update 2015-11-06 12:35:43 -08:00
redmatrix
9cad4c11fe typo 2015-11-05 16:36:19 -08:00
redmatrix
a26d8609a9 handle old files with partial paths 2015-11-05 16:28:10 -08:00
redmatrix
001e4276d3 first cut at some much better hook documentation derived from bamfic's automated list (doc/hooks.html) 2015-11-05 16:08:18 -08:00
redmatrix
58fe4f5cb3 fix the file chunking api now that we've got working data to test with 2015-11-05 00:00:41 -08:00
redmatrix
f8b612a2c0 Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	install/update.php
2015-11-04 23:17:09 -08:00
redmatrix
f7468ab473 re-arrange file api calls so the api pathnames don't shadow each other 2015-11-04 20:50:43 -08:00
redmatrix
1213893a71 api calls to fetch file (attach) meta data and to chunk file content fetching which will eventually allow us to clone large videos without hitting memory limits 2015-11-04 19:49:41 -08:00
redmatrix
b6b2420ff7 protocol upgrade 2015-11-03 23:54:53 -08:00
redmatrix
77a03e376c Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	include/photo/photo_driver.php
	include/text.php
	mod/post.php
2015-11-03 20:46:47 -08:00
redmatrix
877b3361c8 better re-install detection/protection. This necessitated a slight protocol change but should not introduce any compatibility issues with older software. Things just work better if you use an up-to-date server. 2015-11-03 20:28:56 -08:00
redmatrix
2fbfc2a8f1 need better peer verification due to re-install issue, this is temporary 2015-11-03 19:50:40 -08:00
redmatrix
e09b49288f provide admin setting to change directory server 2015-11-03 18:34:16 -08:00