aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5 from redmatrix/mastermrjive2015-09-2997-3163/+137724
|\ | | | | updating from original codebase
| * remove debuggingredmatrix2015-09-281-4/+1
| |
| * add one more level of parentheses to ensure operator precedence is correctly ↵redmatrix2015-09-282-4/+4
| | | | | | | | evaluated
| * check public scopes against visitor in item_permissions_sql()redmatrix2015-09-282-3/+38
| |
| * resolve conflictsredmatrix2015-09-282-10/+0
| |
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-283-1/+11
| |\
| | * process_delivery: ignore selfredmatrix2015-09-284-3/+13
| | |
| * | ignore self delivery in process_deliveryredmatrix2015-09-281-7/+5
| | |
| * | Merge branch 'deadsite'redmatrix2015-09-2816-29/+99
| |\ \
| | * | typoredmatrix2015-09-281-2/+2
| | | |
| | * | create site records for all queued sites and check for deathredmatrix2015-09-289-21/+68
| | | |
| | * | add site_type to queries, first few - several more to go.redmatrix2015-09-283-5/+9
| | | |
| | * | schema support for additional site typesredmatrix2015-09-284-3/+22
| | | |
| * | | a clear is needed after floatingMario Vavti2015-09-281-1/+1
| | | |
| * | | private mail: bring additional inbox/outbox views and ajaxify single message ↵Mario Vavti2015-09-287-32/+39
| |/ / | | | | | | | | | drop
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-271-4/+6
| |\| | | | | | | | | | | | | Conflicts: include/zot.php
| | * well there's one problem...redmatrix2015-09-271-4/+4
| | |
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-275-2795/+2335
| |\| | | | | | | | | | | | | | | | Conflicts: include/zot.php util/messages.po
| | * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-272-31/+31
| | |\
| | | * Another Spanish updatejeroenpraat2015-09-252-31/+31
| | | |
| | * | add some safety checks on the sending side of syncredmatrix2015-09-273-30/+44
| | |/
| * | move string files to hmessages.po and hstrings.php for hubzilla to avoid ↵redmatrix2015-09-2633-15/+134666
| | | | | | | | | | | | endless merge conflicts.
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-09-265-79/+33
| |\ \
| | * \ Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2015-09-2515-0/+0
| | |\ \
| | * | | private mail: some work on conversations viewMario Vavti2015-09-255-79/+33
| | | | |
| * | | | import_xchan_photo: check the return headers to ensure it's an image ↵redmatrix2015-09-262-46/+64
| | |/ / | |/| | | | | | | | | | content-type of some form as imagick chucks a wobbly if you try to initialise an image with an html error page.
| * | | As a result of the logo vote: replaced favicon, remade alternative hubzilla ↵jeroenpraat2015-09-2515-0/+0
| |/ / | | | | | | | | | avatar and uploaded 6 logo variants. Originals courtesy of Iko.
| * | deliveries per process ui for settingredmatrix2015-09-252-0/+4
| | |
| * | remove redundant coderedmatrix2015-09-241-7/+1
| | |
| * | delivery optimisationsredmatrix2015-09-242-8/+54
| | |
| * | clean up the delivery reports to make them manageable, more approachable, ↵redmatrix2015-09-241-2/+50
| | | | | | | | | | | | and translateable
| * | add Diaspora (actually any external service which uses the queue) to ↵redmatrix2015-09-241-0/+8
| | | | | | | | | | | | delivery reports
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-09-2413-141/+285
| |\ \
| | * \ Merge pull request #55 from git-marijus/masterredmatrix2015-09-2513-141/+285
| | |\ \ | | | | | | | | | | some heavy private mail restructuring - work in progress
| | | * | some heavy private mail restructuring - work in progressMario Vavti2015-09-2413-141/+285
| | |/ /
| * / / Document the additional content export optionsredmatrix2015-09-244-4/+25
| |/ /
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-232-2/+3
| |\| | | | | | | | | | | | | Conflicts: install/update.php
| | * dummy updateredmatrix2015-09-233-3/+7
| | |
| * | add vdata field for caldavredmatrix2015-09-234-2/+13
| | |
| * | timezone tweaksredmatrix2015-09-231-6/+10
| | |
| * | add plugin hooks to channel sync/import/exportredmatrix2015-09-233-0/+8
| | |
* | | Merge pull request #4 from redmatrix/mastermrjive2015-09-232-8/+31
|\| | | | | | | | updating from original codebase
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-220-0/+0
| |\| | | | | | | | | | | | | Conflicts: include/items.php
| | * problems with extended item import and signaturesredmatrix2015-09-221-3/+62
| | |
| * | merge issueredmatrix2015-09-221-4/+2
| | |
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-221-2/+4
| |\|
| | * don't send sync packets to deleted hubloc locationsredmatrix2015-09-221-2/+4
| | |
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-220-0/+0
| |\| | | | | | | | | | | | | Conflicts: include/zot.php
| | * inverted logic syncing deleted hublocsredmatrix2015-09-221-1/+1
| | |
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-221-1/+3
| |\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 18:14:18 +0000