Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
| * | remove orphan mod_connections editing code (now done in mod/connedit) | redmatrix | 2015-08-24 | 1 | -3/+0 |
| | | |||||
* | | 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. | ||||
* | | edited event showing bad signature and null_date for edit timestamp | redmatrix | 2015-08-24 | 1 | -1/+7 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-23 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | Conflicts: include/zot.php install/update.php util/messages.po | ||||
| * | issues with abook sync between hubzilla and red | redmatrix | 2015-08-23 | 1 | -2/+1 |
| | | |||||
* | | 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 | 1 | -3/+0 |
| | | |||||
* | | issues encountered with hubzilla DB changes, zot_refresh and item_drop and ↵ | redmatrix | 2015-08-23 | 2 | -4/+4 |
| | | | | | | | | hub sync | ||||
* | | support ical priority | redmatrix | 2015-08-20 | 1 | -7/+19 |
| | | |||||
* | | cleanup of task widget - make jquery workflow a bit smoother | redmatrix | 2015-08-20 | 2 | -12/+12 |
| | | |||||
* | | more work on tasks | redmatrix | 2015-08-20 | 2 | -0/+45 |
| | | |||||
* | | do ical export before checking logged in channel | redmatrix | 2015-08-20 | 1 | -1/+1 |
| | | |||||
* | | 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 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-19 | 1 | -50/+71 |
|\| | | | | | | | | | Conflicts: include/api.php | ||||
| * | add photo_detail api call | redmatrix | 2015-08-18 | 1 | -68/+89 |
| | | |||||
* | | event integration improvements | redmatrix | 2015-08-19 | 2 | -2/+24 |
| | | |||||
* | | import and export tasks (calendar todo items) | redmatrix | 2015-08-18 | 1 | -5/+203 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-17 | 1 | -4/+16 |
|\| | | | | | | | | | Conflicts: include/identity.php | ||||
| * | provide ability to export by month as well as by year | redmatrix | 2015-08-17 | 1 | -3/+14 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-17 | 1 | -0/+12 |
|\| | |||||
| * | add item_id to yearly dump files | redmatrix | 2015-08-17 | 1 | -0/+12 |
| | | |||||
* | | provide module for importing yearly content dumps | redmatrix | 2015-08-17 | 1 | -0/+11 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-14 | 1 | -3/+0 |
|\| | | | | | | | | | | | Conflicts: include/zot.php util/messages.po | ||||
| * | Properly fix which perms get checked for comments, Mike's solution | Alexandre Hannud Abdo | 2015-08-14 | 1 | -14/+3 |
| | | |||||
| * | revert 36b5f6ac | redmatrix | 2015-08-12 | 1 | -12/+14 |
| | | |||||
* | | add item validation function | redmatrix | 2015-08-13 | 2 | -19/+34 |
| | | |||||
* | | attach_store needs a lot of documenting to understand what's going on and ↵ | redmatrix | 2015-08-13 | 1 | -0/+23 |
| | | | | | | | | how it got to be this way. Here's the bird's eye view. | ||||
* | | reverting 36b5f6ac | redmatrix | 2015-08-12 | 1 | -11/+18 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-11 | 1 | -1/+11 |
|\| | | | | | | | | | | | Conflicts: doc/history.md mod/import.php | ||||
| * | Require comment perms only for own posts, allow senders to deliver comments ↵ | Alexandre Hannud Abdo | 2015-08-10 | 1 | -1/+11 |
| | | | | | | | | using stream perms. | ||||
* | | more consistent output on forum widget | redmatrix | 2015-08-11 | 1 | -5/+27 |
| | | |||||
* | | remove the forum limit | redmatrix | 2015-08-11 | 1 | -1/+1 |
| | | |||||
* | | arghh | redmatrix | 2015-08-11 | 1 | -1/+1 |
| | | |||||
* | | typo | redmatrix | 2015-08-11 | 1 | -1/+1 |
| | | |||||
* | | wrong cid | redmatrix | 2015-08-11 | 1 | -2/+3 |
| | | |||||
* | | don't show '0' results, like notifications | redmatrix | 2015-08-11 | 1 | -1/+1 |
| | | |||||
* | | order by name | redmatrix | 2015-08-11 | 1 | -1/+1 |
| | | |||||
* | | make sure we only get forums attached to the channel | redmatrix | 2015-08-11 | 1 | -8/+2 |
| | | |||||
* | | set font-weight back to normal on forums widget | redmatrix | 2015-08-11 | 1 | -1/+1 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-11 | 1 | -0/+1 |
|\| | | | | | | | | | | | | | | | Conflicts: include/items.php util/messages.po view/nl/messages.po view/nl/strings.php | ||||
| * | ensure diaspora_signature is converted to json before we store it. | redmatrix | 2015-08-08 | 1 | -0/+3 |
| | | |||||
* | | forum widget | redmatrix | 2015-08-11 | 1 | -4/+4 |
| | |