Commit Graph

4475 Commits

Author SHA1 Message Date
redmatrix 4b13f0e025 since this is now usable, protect the displayed delivery reports from XSS injection 2015-09-22 04:08:03 -07:00
redmatrix 2869ccfe39 delivery reports - crude but mostly functional at least for zot deliveries 2015-09-22 04:04:51 -07:00
redmatrix 8ead4745f8 Merge pull request #54 from git-marijus/master
fix consensus items - issue #53
2015-09-22 19:41:08 +10:00
redmatrix 0b1b11ea53 heavy lifting for delivery reports 2015-09-22 02:32:04 -07:00
Mario Vavti ea9f169a6c fix consensus items - issue #53 2015-09-22 10:59:19 +02:00
redmatrix 326ae5ff6b Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	mod/post.php
2015-09-21 20:29:18 -07:00
redmatrix 8c16f12d7a issue #52 - try all matching hublocs for remote auth, not just the "best one". 2015-09-21 20:20:16 -07:00
redmatrix 477228d4ff issue #50 - cloud listings produce white screen for unauthenticated viewer 2015-09-21 20:17:48 -07:00
redmatrix 9baaa6fa56 issue #51 2015-09-21 20:05:54 -07:00
redmatrix d2565d0f61 looks like chat has been neglected a bit recently 2015-09-20 21:37:18 -07:00
redmatrix f2fefb91d5 change photo permissions when attach permissions are changed through mod/filestorage, and fix lockview for photos. 2015-09-18 01:53:04 -07:00
redmatrix f0a7a6a1e2 consolidate zotfinger and webfinger 2015-09-17 17:51:31 -07:00
Mario Vavti 1cf404177d quickfix for private messages - needs a lot more work 2015-09-17 19:25:13 +02:00
redmatrix c34d8286a3 change matrix to grid, begin webfinger optimisation 2015-09-16 21:27:58 -07:00
redmatrix 4c5a74284b serve as application/xrd+xml 2015-09-15 21:47:01 -07:00
redmatrix 93f5cc1e60 I'm not going to tell you what's wrong because I'll be accused of bashing another project. I'll let you read the logs and figure it out for yourself. Follow the trail of evidence and you'll discover the truth. 2015-09-15 01:24:55 -07:00
redmatrix 325a5b4af4 we need an owner for permissions_sql 2015-09-14 21:25:10 -07:00
jeroenpraat e58ad35fb0 Update siteinfo.php 2015-09-14 16:42:32 +02:00
redmatrix 43ba690eda profile photo change activities 2015-09-13 19:04:46 -07:00
redmatrix 77807d439e minor change on invite 2015-09-11 14:32:18 -07:00
redmatrix f2171173fe separate the links 2015-09-10 19:35:26 -07:00
redmatrix 7f30863df2 forum mode - use linked avatar and name for title instead of "Channel: xxxxx" or "Forum: xxxx" 2015-09-10 19:31:42 -07:00
redmatrix a6a2c02b6a duplicated code 2015-09-10 19:21:32 -07:00
redmatrix d3ee99d677 Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	mod/like.php
2015-09-10 19:20:21 -07:00
redmatrix 4abfd4053a sync likes 2015-09-10 19:18:12 -07:00
redmatrix 05e0ed5173 export likes to clones 2015-09-10 19:17:20 -07:00
redmatrix f2889d24e6 decentralise likes of things so they can be cloned 2015-09-09 22:03:23 -07:00
redmatrix db58b62235 don't auto-open the editor in forum mode. Save the forum selection text until we open it. 2015-09-09 19:54:16 -07:00
redmatrix f3b560b453 fix the lock state when using forum mode 2015-09-09 18:57:06 -07:00
redmatrix 43e064749c major changes to "forum mode" on the network/matrix page 2015-09-09 18:50:15 -07:00
redmatrix 918aaa64e2 profile photo issues #36 2015-09-09 03:40:53 -07:00
redmatrix d702133ded move mod_admin to Comanche finally 2015-09-08 20:48:35 -07:00
redmatrix e8d431c2f6 issues with "use this photo for profile photo" #36 2015-09-08 19:51:52 -07:00
redmatrix 5d32aa94d9 Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	include/menu.php
	mod/menu.php
	mod/mitem.php
2015-09-08 18:46:15 -07:00
redmatrix d413b6eba8 merge conflicts 2015-09-08 18:45:58 -07:00
redmatrix 50d7554ccd add sync packets for menus 2015-09-08 18:40:19 -07:00
redmatrix 75d521d42a menu import and sync 2015-09-08 17:52:39 -07:00
redmatrix 880ca35681 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-07 21:02:05 -07:00
redmatrix 650e98b2a9 work on event sync 2015-09-07 21:01:49 -07:00
redmatrix f84946c135 minor fix to event sync 2015-09-07 21:00:54 -07:00
redmatrix 508969a183 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-07 20:29:13 -07:00
redmatrix c39e3613a8 create event sync packets 2015-09-07 20:28:02 -07:00
redmatrix 4eec9a2fba Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	include/items.php
	view/it/messages.po
	view/it/strings.php
2015-09-07 18:20:47 -07:00
redmatrix 6d1b64065a consolidate import_items/sync_items 2015-09-07 18:14:30 -07:00
redmatrix 9fa0490c44 sync posted top level items rather than deliver them (actually we do both, but sync comes first). This way we get the ACL transferred. 2015-09-07 18:11:30 -07:00
redmatrix 2312f03eac Always open rpost editor on document ready 2015-09-06 20:50:31 -07:00
redmatrix 1d09e4b620 use conversation defaults for /public page instead of collapsed list mode, but allow over-ride 2015-09-06 16:42:50 -07:00
redmatrix 3f6d6745de syntax 2015-09-05 15:33:09 -07:00
redmatrix b1888afa10 fix typos before pushing 2015-09-03 18:47:03 -07:00
redmatrix d79e81a069 import and sync chatrooms 2015-09-03 18:44:40 -07:00