Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | begin embeddable/shareable design elements (blocks, webpages, layouts, ↵ | friendica | 2014-08-27 | 2 | -2/+34 |
| | | | | menus, etc.) | ||||
* | ability to create/edit/delete custom profile field definitions - read the ↵ | friendica | 2014-08-27 | 4 | -1/+91 |
| | | | | source. Currently the created entries aren't added to the allowed fields arrays, but this can be done by hand until that bit is made available. Only choice for input type at the moment is 'text' or a text input, not a textarea. Multiple choice will be added later. | ||||
* | mind numbing drudgery continued... | friendica | 2014-08-27 | 4 | -85/+76 |
| | |||||
* | Admin setting for Diaspora Protocol enable. We may want to have this also at ↵ | friendica | 2014-08-27 | 2 | -0/+4 |
| | | | | a channel level since there are privacy issues and quirks and trade-offs. | ||||
* | thanks thomas... | friendica | 2014-08-27 | 1 | -0/+68 |
| | |||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-08-27 | 6 | -6/+6 |
|\ | |||||
| * | Merge pull request #574 from tuscanhobbit/master | RedMatrix | 2014-08-27 | 6 | -6/+6 |
| |\ | | | | | | | Notifications links load on the same window(tab) | ||||
| | * | notifications open in the same window(tab) | tuscanhobbit | 2014-08-27 | 6 | -6/+6 |
| | | | |||||
| | * | Merge pull request #1 from friendica/master | Paolo T | 2014-08-18 | 331 | -24096/+35390 |
| | |\ | | | | | | | | | Red master has been merged | ||||
* | | | | compatibility notes | friendica | 2014-08-27 | 2 | -1/+2 |
|/ / / | |||||
* | | | place to store multiple choice and select items for extensible profiles | friendica | 2014-08-26 | 3 | -2/+12 |
| | | | |||||
* | | | and ... we've got a comment coming the other way | friendica | 2014-08-26 | 1 | -0/+1 |
| | | | |||||
* | | | more hard work | friendica | 2014-08-26 | 4 | -123/+159 |
| | | | |||||
* | | | works one way sort of - now to go the other way - which will require fixing ↵ | friendica | 2014-08-26 | 4 | -29/+51 |
| | | | | | | | | | | | | a whole slew of FIXMEs | ||||
* | | | houston we have liftoff | friendica | 2014-08-26 | 2 | -12/+14 |
| | | | |||||
* | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-08-26 | 6 | -77/+48 |
|\ \ \ | |||||
| * | | | make vcard and contact block widget look-alike | marijus | 2014-08-27 | 2 | -46/+38 |
| | | | | |||||
| * | | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-08-26 | 1 | -0/+1 |
| |\ \ \ | |||||
| | * | | | Revert - see comments. | Thomas Willingham | 2014-08-26 | 1 | -3/+3 |
| | | | | | |||||
| | * | | | HTML doesn't work without ACCOUNT_ROLE_ALLOWCODE, so don't offer it | Thomas Willingham | 2014-08-26 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | as an option. | ||||
| * | | | | add background color to widgets | marijus | 2014-08-26 | 4 | -31/+9 |
| | | | | | |||||
| * | | | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-08-26 | 23 | -82/+489 |
| |\| | | | |||||
| * | | | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-08-25 | 2 | -1/+14 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-08-25 | 2 | -295/+378 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-08-24 | 1 | -0/+2 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-08-24 | 2 | -1/+114 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-08-24 | 16 | -748/+765 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-08-23 | 121 | -1922/+2405 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'upstream' | marijus | 2014-08-22 | 15 | -138/+275 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/friendica/red into upstream | marijus | 2014-08-22 | 28 | -780/+663 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-08-21 | 14 | -469/+360 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-08-20 | 3 | -196/+51 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-08-20 | 7 | -239/+373 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-08-19 | 2 | -5927/+6256 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | | | | take off the kid gloves | friendica | 2014-08-26 | 4 | -52/+41 |
| |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | get rid of template "auto generated" warnings | friendica | 2014-08-25 | 15 | -75/+0 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | more diaspora stuff - most of the basic bits are there except queueing and ↵ | friendica | 2014-08-25 | 18 | -12/+300 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | physical delivery (I'm keeping delivery turned off until some of the bugs are fixed so we don't cause inifinite loops or network meltdowns) - now it's just a matter of going through and methodically finding all the bugs | ||||
* | | | | | | | | | | | | | | | sort out some anomalies | friendica | 2014-08-25 | 4 | -8/+20 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | more diaspora heavy lifting | friendica | 2014-08-25 | 3 | -66/+248 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | notifications/system not marking all notifications seen | friendica | 2014-08-25 | 1 | -1/+1 |
| |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | re-obscure item body if localize_item() changes it. It's already flagged as ↵ | friendica | 2014-08-25 | 2 | -1/+14 |
| |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | obscured so we need it to actually be obscured. | ||||
* | | | | | | | | | | | | | Add d* folks to address book. WARNING - DO NOT ATTEMPT THIS. LEAVE IT THE ↵ | friendica | 2014-08-24 | 2 | -295/+378 |
| |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FRUCK ALONE until the feature is stable. I won't help you if you try this and end up with a borked site. You are completely on your own. | ||||
* | | | | | | | | | | | | onepoll: don't poll archived, blocked, or ignored connections | friendica | 2014-08-24 | 1 | -0/+2 |
| |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | diaspora discovery | friendica | 2014-08-24 | 2 | -1/+114 |
| |_|_|_|_|_|_|/ / / |/| | | | | | | | | | |||||
* | | | | | | | | | | unobscure viewsrc items | friendica | 2014-08-23 | 1 | -2/+5 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-08-23 | 11 | -738/+751 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | fix nl | Jeroen | 2014-08-23 | 2 | -13/+13 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Minor adjustment photo view + update nl (at 100\%\!) | Jeroen | 2014-08-23 | 11 | -726/+739 |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
* | | | | | | | | | | add "any connections" to can_comment_on_post() - was missing | friendica | 2014-08-23 | 1 | -0/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | switch everything over to crypto_encapsulate() | friendica | 2014-08-23 | 4 | -8/+8 |
|/ / / / / / / / / |