aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-261-1/+1
|\
| * use extended export format for items in api photo_detailredmatrix2015-08-261-1/+1
| |
* | redphotos updatesredmatrix2015-08-261-1/+8
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-261-1/+21
|\|
| * add item info to photo detail in apiredmatrix2015-08-261-1/+21
| |
* | change attach_store to allow a predefined item to accompany a photoredmatrix2015-08-262-44/+82
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-261-1/+12
|\| | | | | | | | | Conflicts: include/diaspora.php
| * support likes on comments with diaspora owner by sending as activityredmatrix2015-08-261-14/+19
| |
| * required for future workredmatrix2015-08-261-1/+12
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-262-2/+1
|\| | | | | | | | | Conflicts: mod/import.php
| * syntax error in last checkinredmatrix2015-08-261-4/+4
| |
| * import fixesredmatrix2015-08-262-2/+34
| |
* | import fixesredmatrix2015-08-261-2/+15
| |
* | add repository type as one that is able to self-identify as a public forumredmatrix2015-08-251-1/+1
| |
* | this is weirdredmatrix2015-08-254-205/+191
| |
* | make diaspora person guids for hubzilla folks globally unique. That's what a ↵redmatrix2015-08-252-1/+5
| | | | | | | | globally unique ID is. This forever kills the prospect of making nomadic identity work flawlessly on Diaspora. But since all your identities have the same guid, this allows your different identities to communicate with Diaspora; which would otherwise fail to connect to your other instances because of the guid collision.
* | lots of stuff that was needed for successful photo import from redredmatrix2015-08-242-17/+81
| |
* | don't try to optimise the session table. Just let it fragment and let the DB ↵redmatrix2015-08-241-3/+0
| | | | | | | | worry about it.
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-242-138/+1
|\| | | | | | | | | | | Conflicts: mod/connections.php mod/connedit.php
| * remove orphan mod_connections editing code (now done in mod/connedit)redmatrix2015-08-244-144/+13
| |
* | edited event showing bad signature and null_date for edit timestampredmatrix2015-08-242-1/+12
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-234-745/+745
|\| | | | | | | | | | | | | Conflicts: include/zot.php install/update.php util/messages.po
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-232-743/+743
| |\
| | * Final (temporary I suppose) Spanish string updatejeroenpraat2015-08-222-743/+743
| | |
| * | issues with abook sync between hubzilla and redredmatrix2015-08-234-87/+92
| |/
* | provide a comment_policy of "network: diaspora" to handle their special case ↵redmatrix2015-08-231-0/+2
| | | | | | | | public-posts-are-commentable-by-anybody permission without breaking any other permissions.
* | sync abook flags in memory after altering themredmatrix2015-08-232-3/+11
| |
* | issues encountered with hubzilla DB changes, zot_refresh and item_drop and ↵redmatrix2015-08-232-4/+4
| | | | | | | | hub sync
* | change name of moduleredmatrix2015-08-226-11/+13
| |
* | increase width of tasklist input elementredmatrix2015-08-221-1/+5
| |
* | restrict event notification to events and birthdays (exclude tasks)redmatrix2015-08-221-0/+2
| |
* | add load_pdl hook for pluginsredmatrix2015-08-222-1/+6
| |
* | add task widgetredmatrix2015-08-211-0/+5
| |
* | support ical priorityredmatrix2015-08-201-7/+19
| |
* | limit the height of tasklistredmatrix2015-08-201-0/+8
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-205-4/+16
|\|
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-202-105/+105
| |\
| * | missed this one - it's requiredredmatrix2015-08-205-4/+16
| | |
* | | put tasklist into events page comanche layoutredmatrix2015-08-201-0/+3
| | |
* | | cleanup of task widget - make jquery workflow a bit smootherredmatrix2015-08-203-34/+44
| | |
* | | more work on tasksredmatrix2015-08-205-9/+71
| | |
* | | We don't need photos to also include attachments. It's interesting, but not ↵redmatrix2015-08-201-0/+1
| | | | | | | | | | | | all that useful.
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-202-105/+105
|\ \ \ | | |/ | |/|
| * | Another Spanish strings updatejeroenpraat2015-08-202-105/+105
| |/
* | some event related fixes and some base work for implementing native tasks ↵redmatrix2015-08-203-18/+100
| | | | | | | | (to-do lists); which should already be importable and exportable.
* | do ical export before checking logged in channelredmatrix2015-08-202-24/+22
| |
* | add carriage return to newlines for exported events (rfc2445:4.1)redmatrix2015-08-201-31/+31
| |
* | extra encoding on mail titlesredmatrix2015-08-202-2/+2
| |
* | use consistent terminologyredmatrix2015-08-191-1/+1
| |
* | fix photo locationredmatrix2015-08-192-2/+13
| |