Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | no this isn't it. well ok, it's part of it, but not the important part. it's ↵ | redmatrix | 2015-06-28 | 2 | -17/+93 |
| | | | | still pretty cool. | ||||
* | ensure we always sign a trimmed item body. | redmatrix | 2015-06-22 | 1 | -3/+3 |
| | |||||
* | discovered a couple of loose ends in the per-member enable diaspora setting | redmatrix | 2015-06-22 | 1 | -0/+26 |
| | |||||
* | some diaspora import issues uncovered during dry-run tests | redmatrix | 2015-06-21 | 1 | -6/+4 |
| | |||||
* | Merge pull request #352 from solstag/store_update_fix | redmatrix | 2015-06-21 | 1 | -9/+10 |
|\ | | | | | Make item_store_update only affect the data we requested | ||||
| * | Make item_store_update only affect the data we requested | Alexandre Hannud Abdo | 2015-06-20 | 1 | -9/+10 |
| | | |||||
* | | ensure the photo driver is included | redmatrix | 2015-06-20 | 1 | -0/+1 |
| | | |||||
* | | import_diaspora - incorrect method for importing channel photo, and add ↵ | redmatrix | 2015-06-20 | 1 | -20/+42 |
| | | | | | | | | duplicate reddress detection/correction | ||||
* | | wrong logic | redmatrix | 2015-06-19 | 1 | -1/+1 |
| | | |||||
* | | import_diaspora - a few more atypical settings | redmatrix | 2015-06-19 | 1 | -3/+19 |
| | | |||||
* | | import_diaspora: add all the friends | redmatrix | 2015-06-19 | 1 | -4/+13 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-19 | 1 | -5/+2 |
|\ \ | |||||
| * | | bring some more generic-content-wrappers and fix some of them | Mario Vavti | 2015-06-19 | 1 | -5/+2 |
| |/ | |||||
* / | very early attempt diaspora import from diaspora export file. Currently the ↵ | redmatrix | 2015-06-19 | 1 | -0/+100 |
|/ | | | | json export has to be gunzipped prior to uploading and we're net yet adding connections (which should come soon) and we can't import items until they add guids to the export file - so consider it a work in progress. This first attempt should create a channel and get your profile details setup providing there isn't a nickname conflict on the server. That will also be handled later. | ||||
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-18 | 1 | -2/+2 |
|\ | |||||
| * | fix deleting of album for remote channel | Mario Vavti | 2015-06-16 | 1 | -2/+2 |
| | | |||||
* | | issues with markdownify and escaped HTML | redmatrix | 2015-06-18 | 2 | -4/+12 |
|/ | |||||
* | don't provide a connect button on the sys channel profile sidebar | redmatrix | 2015-06-11 | 1 | -0/+4 |
| | |||||
* | hubzilla compatibility function | redmatrix | 2015-06-11 | 1 | -0/+14 |
| | |||||
* | retire old Friendica RINO encryption functions | redmatrix | 2015-06-09 | 1 | -28/+0 |
| | |||||
* | toggle diaspora protocol on a per-channel level in addition to the existing ↵ | redmatrix | 2015-06-09 | 2 | -0/+28 |
| | | | | per site setting. Default is enabled if the site setting is enabled. | ||||
* | add site_dead flag to prevent delivery to dead sites. Allow sys channel ↵ | redmatrix | 2015-06-08 | 1 | -8/+17 |
| | | | | webpages to be viewed even if site is configured "block public". | ||||
* | asjld work | redmatrix | 2015-06-02 | 1 | -3/+13 |
| | |||||
* | error in directory bbcode image filter | redmatrix | 2015-05-31 | 1 | -1/+1 |
| | |||||
* | bare bones ASLD | redmatrix | 2015-05-31 | 1 | -4/+44 |
| | |||||
* | some basic background work for activitystreams-json-ld-2.0 conversions | redmatrix | 2015-05-31 | 2 | -0/+45 |
| | |||||
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-30 | 2 | -9/+14 |
|\ | |||||
| * | should not redefine $var in the function call | Mario Vavti | 2015-05-29 | 1 | -1/+1 |
| | | |||||
| * | fix menu render for menu item edit - menu preview | Mario Vavti | 2015-05-29 | 1 | -1/+5 |
| | | |||||
| * | some fixes to make menu sharing work and expose it in the ui. | Mario Vavti | 2015-05-29 | 2 | -6/+7 |
| | | |||||
* | | strip images from directory text entries | redmatrix | 2015-05-30 | 1 | -0/+5 |
|/ | |||||
* | there was a reason we included that file | redmatrix | 2015-05-28 | 1 | -3/+3 |
| | |||||
* | parse error | redmatrix | 2015-05-28 | 1 | -2/+2 |
| | |||||
* | another case of committing with unsaved changes in a second window | redmatrix | 2015-05-28 | 1 | -2/+4 |
| | |||||
* | add menu_created, menu_edited fields to DB | redmatrix | 2015-05-28 | 1 | -4/+31 |
| | |||||
* | menu encoding for sharing/exchange | redmatrix | 2015-05-27 | 1 | -0/+39 |
| | |||||
* | some high-level stuff we may need for shareable menus. Also make the client ↵ | redmatrix | 2015-05-27 | 1 | -11/+1 |
| | | | | register function do the right thing even though I refuse to make it work. If **you** want service federation with things like pumpio and openid connect, it's time for **you** to put your own skin in the game and quit treating project volunteers like excrement just because you can't get up off your lazy buttocks. | ||||
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-27 | 2 | -0/+81 |
|\ | |||||
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrix | Mario Vavti | 2015-05-27 | 1 | -1/+1 |
| |\ | |||||
| * | | define some custom attributes and html5 elements for htmlpurifier | Mario Vavti | 2015-05-27 | 1 | -0/+66 |
| | | | |||||
| * | | make it possible to include menus in blocks - this will only work in html ↵ | Mario Vavti | 2015-05-27 | 1 | -0/+15 |
| | | | | | | | | | | | | blocks of course | ||||
* | | | fix for forked thread on diaspora | redmatrix | 2015-05-27 | 2 | -11/+5 |
| | | | |||||
* | | | revert for now | redmatrix | 2015-05-27 | 1 | -5/+5 |
| | | | |||||
* | | | Comments need to have some kind of routing instructions. | redmatrix | 2015-05-26 | 1 | -0/+13 |
| |/ |/| | |||||
* | | Update api.php | jeroenpraat | 2015-05-26 | 1 | -1/+1 |
|/ | | | one comma to much | ||||
* | placeholder for dynamic rego | redmatrix | 2015-05-25 | 2 | -10/+2 |
| | |||||
* | slow but forward progress on dynamic client registration | redmatrix | 2015-05-25 | 1 | -0/+42 |
| | |||||
* | some work on issue #329 | redmatrix | 2015-05-25 | 3 | -7/+10 |
| | |||||
* | one more | Habeas Codice | 2015-05-24 | 1 | -2/+2 |
| | |||||
* | avoid db compatibility issues | Habeas Codice | 2015-05-24 | 1 | -2/+2 |
| |