Commit Graph

4517 Commits

Author SHA1 Message Date
redmatrix be701677d6 Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	view/nl/messages.po
	view/nl/strings.php
2015-10-17 16:38:57 -07:00
redmatrix b6c765c9dc allow homepage content to be a full redirect 2015-10-17 16:33:28 -07:00
redmatrix 1d2797dc1f bring back chat expiration setting and adjust chat size for our now smaller content region 2015-10-17 14:54:27 -07:00
redmatrix 7fe6bc52d0 change setup defaults to 127.0.0.1 instead of localhost for DB server, add documentation to the INSTALL.txt explaining the choice. 2015-10-16 13:05:40 -07:00
redmatrix 52f2509280 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-10-16 04:22:09 -07:00
redmatrix c07f694a07 another try at issue #89 - rotating photos 2015-10-16 04:21:40 -07:00
Mario Vavti c49198fd71 this is all the info we need 2015-10-16 12:24:27 +02:00
redmatrix 3f7ee613fc mail sync debugging 2015-10-15 20:40:24 -07:00
redmatrix 7517c76ae4 Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	install/update.php
2015-10-15 16:02:37 -07:00
redmatrix bf5a1f662a generate all (non-square) photo scales - even if the original photo is smaller than the scale target sizes. 2015-10-15 14:18:40 -07:00
redmatrix d9753989bf issue #89 - rotating photos does not work 2015-10-15 13:23:40 -07:00
Mario Vavti 9f5c61b1fd reflect default image size changes in mod/photos 2015-10-15 14:52:31 +02:00
Mario Vavti 3bca640521 do not try to remove photos twice 2015-10-15 13:57:15 +02:00
redmatrix b33a9a71f6 more work on import & sync of private mail and conversations 2015-10-14 17:40:50 -07:00
redmatrix 8af3dc140e issue #87 - photos not getting deleted from mod_photo when deleted in DAV or cloud 2015-10-14 15:08:07 -07:00
redmatrix de697a4267 issue #86 - like/dislike in photos not working 2015-10-14 14:16:16 -07:00
Mario Vavti 3c74aec973 fix /channel not updating after posting comment 2015-10-13 12:05:55 +02:00
jeroenpraat a9696abdce Redesigned the export page. Please fix my English if I made some mistakes. 2015-10-09 16:45:29 +02:00
Andrew Manning 9034765790 There is no mod/import_items tool in RedMatrix 2015-10-07 20:37:00 -04:00
Andrew Manning 8bf45536d3 Forgot the year and month url part 2015-10-06 06:50:33 -04:00
Andrew Manning e1fca2a1ab Add message about exporting by year/month to uexport 2015-10-06 06:45:55 -04:00
Mario Vavti 7776c56c6c bring single message view to inbox/outbox view 2015-10-04 19:51:23 +02:00
Mario Vavti 38fe928d06 cleanup some unused variables 2015-10-04 13:09:26 +02:00
Mario Vavti c229223e01 private mail: if receiver is not in abook provide only his webbie to the form 2015-10-04 12:08:23 +02:00
Mario Vavti d337cc6618 private mail: $preid should be abook_xchan not abook_id 2015-10-02 22:53:51 +02:00
Mario Vavti 5ba39fef9a private mail compositor changes 2015-10-02 17:51:37 +02:00
redmatrix 1da3828a09 issue with resetting post perms to default audience - not sticking. 2015-10-01 20:22:03 -07:00
redmatrix 9bdb7bef5d add delivery reports to mail (not backported to redmatrix) 2015-09-30 19:27:53 -07:00
redmatrix b3525b8657 remove debugging 2015-09-28 20:04:44 -07:00
redmatrix 8d5556764c add one more level of parentheses to ensure operator precedence is correctly evaluated 2015-09-28 20:03:11 -07:00
redmatrix f965209eee check public scopes against visitor in item_permissions_sql() 2015-09-28 19:45:57 -07:00
redmatrix 3b53cd56ef Merge branch 'deadsite' 2015-09-28 17:15:34 -07:00
redmatrix e5f47cd14b create site records for all queued sites and check for death 2015-09-28 17:13:11 -07:00
Mario Vavti b97102da01 private mail: bring additional inbox/outbox views and ajaxify single message drop 2015-09-28 17:40:38 +02:00
redmatrix cd2b811555 move string files to hmessages.po and hstrings.php for hubzilla to avoid endless merge conflicts. 2015-09-26 23:44:30 -07:00
Mario Vavti d6293730fc private mail: some work on conversations view 2015-09-25 23:26:28 +02:00
redmatrix ba94f824b9 deliveries per process ui for setting 2015-09-25 01:31:58 -07:00
redmatrix e558ddae3f clean up the delivery reports to make them manageable, more approachable, and translateable 2015-09-24 18:19:33 -07:00
redmatrix 2fe3d16bbe Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-09-24 16:58:32 -07:00
redmatrix 2844f276b9 Document the additional content export options 2015-09-24 16:57:17 -07:00
Mario Vavti b9723aa85b some heavy private mail restructuring - work in progress 2015-09-24 14:07:44 +02:00
redmatrix e45958b967 add plugin hooks to channel sync/import/export 2015-09-23 18:27:04 -07:00
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