Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-26 | 1 | -1/+1 |
|\ | |||||
| * | use extended export format for items in api photo_detail | redmatrix | 2015-08-26 | 1 | -1/+1 |
| | | |||||
* | | redphotos updates | redmatrix | 2015-08-26 | 1 | -1/+8 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-26 | 1 | -1/+21 |
|\| | |||||
| * | add item info to photo detail in api | redmatrix | 2015-08-26 | 1 | -1/+21 |
| | | |||||
* | | change attach_store to allow a predefined item to accompany a photo | redmatrix | 2015-08-26 | 2 | -44/+82 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-26 | 1 | -1/+12 |
|\| | | | | | | | | | Conflicts: include/diaspora.php | ||||
| * | support likes on comments with diaspora owner by sending as activity | redmatrix | 2015-08-26 | 1 | -14/+19 |
| | | |||||
| * | required for future work | redmatrix | 2015-08-26 | 1 | -1/+12 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-26 | 2 | -2/+1 |
|\| | | | | | | | | | Conflicts: mod/import.php | ||||
| * | syntax error in last checkin | redmatrix | 2015-08-26 | 1 | -4/+4 |
| | | |||||
| * | import fixes | redmatrix | 2015-08-26 | 2 | -2/+34 |
| | | |||||
* | | import fixes | redmatrix | 2015-08-26 | 1 | -2/+15 |
| | | |||||
* | | add repository type as one that is able to self-identify as a public forum | redmatrix | 2015-08-25 | 1 | -1/+1 |
| | | |||||
* | | this is weird | redmatrix | 2015-08-25 | 4 | -205/+191 |
| | | |||||
* | | make diaspora person guids for hubzilla folks globally unique. That's what a ↵ | redmatrix | 2015-08-25 | 2 | -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 red | redmatrix | 2015-08-24 | 2 | -17/+81 |
| | | |||||
* | | don't try to optimise the session table. Just let it fragment and let the DB ↵ | redmatrix | 2015-08-24 | 1 | -3/+0 |
| | | | | | | | | worry about it. | ||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-24 | 2 | -138/+1 |
|\| | | | | | | | | | | | Conflicts: mod/connections.php mod/connedit.php | ||||
| * | remove orphan mod_connections editing code (now done in mod/connedit) | redmatrix | 2015-08-24 | 4 | -144/+13 |
| | | |||||
* | | edited event showing bad signature and null_date for edit timestamp | redmatrix | 2015-08-24 | 2 | -1/+12 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-23 | 4 | -745/+745 |
|\| | | | | | | | | | | | | | Conflicts: include/zot.php install/update.php util/messages.po | ||||
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-23 | 2 | -743/+743 |
| |\ | |||||
| | * | Final (temporary I suppose) Spanish string update | jeroenpraat | 2015-08-22 | 2 | -743/+743 |
| | | | |||||
| * | | issues with abook sync between hubzilla and red | redmatrix | 2015-08-23 | 4 | -87/+92 |
| |/ | |||||
* | | provide a comment_policy of "network: diaspora" to handle their special case ↵ | redmatrix | 2015-08-23 | 1 | -0/+2 |
| | | | | | | | | public-posts-are-commentable-by-anybody permission without breaking any other permissions. | ||||
* | | sync abook flags in memory after altering them | redmatrix | 2015-08-23 | 2 | -3/+11 |
| | | |||||
* | | issues encountered with hubzilla DB changes, zot_refresh and item_drop and ↵ | redmatrix | 2015-08-23 | 2 | -4/+4 |
| | | | | | | | | hub sync | ||||
* | | change name of module | redmatrix | 2015-08-22 | 6 | -11/+13 |
| | | |||||
* | | increase width of tasklist input element | redmatrix | 2015-08-22 | 1 | -1/+5 |
| | | |||||
* | | restrict event notification to events and birthdays (exclude tasks) | redmatrix | 2015-08-22 | 1 | -0/+2 |
| | | |||||
* | | add load_pdl hook for plugins | redmatrix | 2015-08-22 | 2 | -1/+6 |
| | | |||||
* | | add task widget | redmatrix | 2015-08-21 | 1 | -0/+5 |
| | | |||||
* | | support ical priority | redmatrix | 2015-08-20 | 1 | -7/+19 |
| | | |||||
* | | limit the height of tasklist | redmatrix | 2015-08-20 | 1 | -0/+8 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-20 | 5 | -4/+16 |
|\| | |||||
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-20 | 2 | -105/+105 |
| |\ | |||||
| * | | missed this one - it's required | redmatrix | 2015-08-20 | 5 | -4/+16 |
| | | | |||||
* | | | put tasklist into events page comanche layout | redmatrix | 2015-08-20 | 1 | -0/+3 |
| | | | |||||
* | | | cleanup of task widget - make jquery workflow a bit smoother | redmatrix | 2015-08-20 | 3 | -34/+44 |
| | | | |||||
* | | | more work on tasks | redmatrix | 2015-08-20 | 5 | -9/+71 |
| | | | |||||
* | | | We don't need photos to also include attachments. It's interesting, but not ↵ | redmatrix | 2015-08-20 | 1 | -0/+1 |
| | | | | | | | | | | | | all that useful. | ||||
* | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-20 | 2 | -105/+105 |
|\ \ \ | | |/ | |/| | |||||
| * | | Another Spanish strings update | jeroenpraat | 2015-08-20 | 2 | -105/+105 |
| |/ | |||||
* | | some event related fixes and some base work for implementing native tasks ↵ | redmatrix | 2015-08-20 | 3 | -18/+100 |
| | | | | | | | | (to-do lists); which should already be importable and exportable. | ||||
* | | do ical export before checking logged in channel | redmatrix | 2015-08-20 | 2 | -24/+22 |
| | | |||||
* | | add carriage return to newlines for exported events (rfc2445:4.1) | redmatrix | 2015-08-20 | 1 | -31/+31 |
| | | |||||
* | | extra encoding on mail titles | redmatrix | 2015-08-20 | 2 | -2/+2 |
| | | |||||
* | | use consistent terminology | redmatrix | 2015-08-19 | 1 | -1/+1 |
| | | |||||
* | | fix photo location | redmatrix | 2015-08-19 | 2 | -2/+13 |
| | |