Commit Graph

4945 Commits

Author SHA1 Message Date
redmatrix
04b4897dd8 First attempt to turn access control into an object class. The access control manipulation is getting too complex and this will help keep it manageable and reduce a lot of code duplication. 2015-08-27 18:55:30 -07:00
redmatrix
7b28c42693 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-26 23:00:59 -07:00
redmatrix
58ffa31e91 redphotos updates 2015-08-26 23:00:33 -07:00
redmatrix
0b5bad4aa7 use extended export format for items in api photo_detail 2015-08-26 22:58:53 -07:00
redmatrix
2bce61d18b Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-26 22:14:19 -07:00
redmatrix
9cebd24987 change attach_store to allow a predefined item to accompany a photo 2015-08-26 22:13:20 -07:00
redmatrix
0d2c90cc2e add item info to photo detail in api 2015-08-26 22:11:50 -07:00
redmatrix
54c88dfae9 Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	include/diaspora.php
2015-08-26 20:22:50 -07:00
redmatrix
d1c23477df support likes on comments with diaspora owner by sending as activity 2015-08-26 20:20:41 -07:00
redmatrix
8fb1356623 required for future work 2015-08-26 17:49:57 -07:00
redmatrix
5fa2aa6d48 lots of stuff that was needed for successful photo import from red 2015-08-24 20:58:12 -07:00
redmatrix
0edac8810b don't try to optimise the session table. Just let it fragment and let the DB worry about it. 2015-08-24 16:05:51 -07:00
redmatrix
d256e8e9f2 edited event showing bad signature and null_date for edit timestamp 2015-08-24 01:46:54 -07:00
redmatrix
250d286f1d remove orphan mod_connections editing code (now done in mod/connedit) 2015-08-24 01:28:13 -07:00
redmatrix
eac9c8a7e6 Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	include/zot.php
	install/update.php
	util/messages.po
2015-08-23 20:23:55 -07:00
redmatrix
a67213627c provide a comment_policy of "network: diaspora" to handle their special case public-posts-are-commentable-by-anybody permission without breaking any other permissions. 2015-08-23 18:48:33 -07:00
redmatrix
b1f091e4d7 issues with abook sync between hubzilla and red 2015-08-23 17:40:47 -07:00
redmatrix
8cd583fd8c sync abook flags in memory after altering them 2015-08-23 17:36:00 -07:00
redmatrix
bf190be5b4 issues encountered with hubzilla DB changes, zot_refresh and item_drop and hub sync 2015-08-23 13:27:34 -07:00
redmatrix
7688bf3f21 support ical priority 2015-08-20 22:24:33 -07:00
redmatrix
49c4aa1a54 cleanup of task widget - make jquery workflow a bit smoother 2015-08-20 20:40:42 -07:00
redmatrix
afbbc9cd72 more work on tasks 2015-08-20 18:43:01 -07:00
redmatrix
a322254f2a do ical export before checking logged in channel 2015-08-20 04:51:03 -07:00
redmatrix
fd7b668a16 add carriage return to newlines for exported events (rfc2445:4.1) 2015-08-20 02:07:51 -07:00
redmatrix
5786fd2221 extra encoding on mail titles 2015-08-20 01:12:35 -07:00
redmatrix
419b4ecfde use consistent terminology 2015-08-19 21:17:24 -07:00
redmatrix
69920fb717 fix photo location 2015-08-19 19:17:17 -07:00
redmatrix
8d66fbccfa Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	include/api.php
2015-08-19 16:54:12 -07:00
redmatrix
a4caaefd32 event integration improvements 2015-08-19 16:50:32 -07:00
redmatrix
c96f121d41 add photo_detail api call 2015-08-18 22:14:16 -07:00
redmatrix
4e3d295c90 import and export tasks (calendar todo items) 2015-08-18 19:06:50 -07:00
redmatrix
9763c46b7e Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	include/identity.php
2015-08-17 22:23:23 -07:00
redmatrix
f682325924 provide ability to export by month as well as by year 2015-08-17 22:20:10 -07:00
redmatrix
ea331b043c Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-17 21:41:14 -07:00
redmatrix
1a4a921528 provide module for importing yearly content dumps 2015-08-17 21:40:40 -07:00
redmatrix
1982fc807f add item_id to yearly dump files 2015-08-17 21:38:43 -07:00
redmatrix
18bc12c21c Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	include/zot.php
	util/messages.po
2015-08-14 22:24:15 -07:00
Alexandre Hannud Abdo
73b30de9cb Properly fix which perms get checked for comments, Mike's solution 2015-08-14 12:21:05 -03:00
redmatrix
d140620008 add item validation function 2015-08-13 19:35:57 -07:00
redmatrix
50a1e0c618 attach_store needs a lot of documenting to understand what's going on and how it got to be this way. Here's the bird's eye view. 2015-08-13 17:11:59 -07:00
redmatrix
ef73880459 reverting 36b5f6ac 2015-08-12 22:48:08 -07:00
redmatrix
0b7365e2db revert 36b5f6ac 2015-08-12 22:37:24 -07:00
redmatrix
2d9d4dfeb3 Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	doc/history.md
	mod/import.php
2015-08-11 22:35:36 -07:00
redmatrix
0e8991fec2 more consistent output on forum widget 2015-08-11 22:23:20 -07:00
redmatrix
b651604e8b remove the forum limit 2015-08-11 20:58:03 -07:00
redmatrix
1932e72603 arghh 2015-08-11 20:25:52 -07:00
redmatrix
be4eb4eeb8 typo 2015-08-11 20:25:02 -07:00
redmatrix
89fa36ce2a wrong cid 2015-08-11 20:24:06 -07:00
redmatrix
80df97e734 don't show '0' results, like notifications 2015-08-11 20:18:34 -07:00
redmatrix
8dd7fab38d order by name 2015-08-11 20:16:17 -07:00