Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #250 from beardy-unixer/master | friendica | 2013-12-22 | 6 | -37/+161 |
|\ | | | | | Various bits | ||||
| * | Style | Thomas Willingham | 2013-12-22 | 1 | -7/+7 |
| | | |||||
| * | Must have broken that in a merge - put it back | Thomas Willingham | 2013-12-22 | 1 | -0/+17 |
| | | |||||
| * | Ooops, also update the DB | Thomas Willingham | 2013-12-22 | 1 | -0/+8 |
| | | |||||
| * | Achievements | Thomas Willingham | 2013-12-22 | 1 | -0/+84 |
| | | |||||
| * | xref | Thomas Willingham | 2013-12-22 | 1 | -0/+20 |
| | | |||||
| * | Some sys chan stuff | Thomas Willingham | 2013-12-22 | 3 | -42/+37 |
| | | |||||
| * | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2013-12-22 | 196 | -2976/+2884 |
| |\ | |/ |/| | |||||
* | | last remaining files to be Comanchified with the exception of mod_admin. ↵ | friendica | 2013-12-22 | 4 | -8/+6 |
| | | | | | | | | | | | | Though I should probably take a third look to see if anything else uses widgets. In fact - it appears that the flattrwidget does. | ||||
* | | appears that I missed a few files for Comanchification. so here's mitem. | friendica | 2013-12-22 | 4 | -6/+14 |
| | | |||||
* | | split private messages into two modules - "message" is just for message ↵ | friendica | 2013-12-21 | 15 | -427/+133 |
| | | | | | | | | lists, "mail" is for reading and writing conversations. This is so we can Comanchify it cleanly. | ||||
* | | comanchify mod_directory. Two modules remaining. Actually three because ↵ | friendica | 2013-12-20 | 5 | -13/+44 |
| | | | | | | | | message needs to be split. | ||||
* | | comanchify mod_search - we've got three modules left to Comanchify: admin, ↵ | friendica | 2013-12-20 | 4 | -1199/+1060 |
| | | | | | | | | directory and message - each of which introduces "interesting challenges" | ||||
* | | doc updates | friendica | 2013-12-20 | 122 | -909/+1288 |
| | | |||||
* | | comanchify connedit, group | friendica | 2013-12-19 | 6 | -28/+42 |
| | | |||||
* | | sourced items which are then edited at the source weren't setting up the ↵ | friendica | 2013-12-19 | 1 | -1/+8 |
| | | | | | | | | second delivery chain. | ||||
* | | default photo issue, and connections page showing deleted accounts. Also ↵ | friendica | 2013-12-19 | 5 | -6/+12 |
| | | | | | | | | show last updated on connedit page | ||||
* | | add bbcode reference | friendica | 2013-12-19 | 2 | -0/+69 |
| | | |||||
* | | give doc/help alternate mimetype support | friendica | 2013-12-19 | 1 | -3/+24 |
| | | |||||
* | | comanchificate mod_photos | friendica | 2013-12-19 | 4 | -27/+29 |
| | | |||||
* | | make default profile photo configurable - should be functional but needs ↵ | friendica | 2013-12-19 | 12 | -120/+31 |
| | | | | | | | | admin ui | ||||
* | | add 'src' parameter to api photo list | friendica | 2013-12-19 | 1 | -1/+4 |
| | | |||||
* | | if somebody tagged you in a private post, the tag email notification ↵ | friendica | 2013-12-19 | 1 | -3/+2 |
| | | | | | | | | contained the obscured message. Clear it. | ||||
* | | more comanche | friendica | 2013-12-19 | 3 | -18/+10 |
| | | |||||
* | | more comanche | friendica | 2013-12-19 | 3 | -7/+8 |
| | | |||||
* | | more comanche migration | friendica | 2013-12-19 | 14 | -128/+59 |
| | | |||||
* | | provide git revision in siteinfo if possible and if not instructed otherwise | friendica | 2013-12-18 | 2 | -5/+17 |
| | | |||||
* | | remove the .wgl (widget list) file processing for ordering widgets on a ↵ | friendica | 2013-12-18 | 1 | -37/+1 |
| | | | | | | | | page. This preceded Comanche and was never used and is now obsolete. | ||||
* | | Merge https://github.com/friendica/red into zpull | friendica | 2013-12-18 | 5 | -1492/+1295 |
|\ \ | |||||
| * \ | Merge pull request #246 from git-marijus/master | friendica | 2013-12-18 | 3 | -19/+13 |
| |\ \ | | | | | | | | | minor fixes | ||||
| | * | | show drop-icon on wall-item hover only | marijus | 2013-12-18 | 2 | -6/+10 |
| | | | | |||||
| | * | | we make this with css now | marijus | 2013-12-18 | 1 | -11/+1 |
| | | | | |||||
| | * | | fix a typo | marijus | 2013-12-18 | 2 | -2/+2 |
| |/ / | |||||
* | | | Add App::poi to store the "person of interest" for a given page. This is so ↵ | friendica | 2013-12-18 | 4 | -32/+31 |
| | | | | | | | | | | | | we can comanchificate the vcard_from_xchan widget -- it will pick up the target xchan from the page environment. | ||||
| | * | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2013-12-18 | 827 | -17329/+33904 |
| | |\ | | |/ | |/| | | | | | | | Conflicts: mod/page.php | ||||
| * | | Merge pull request #245 from tuscanhobbit/master | Paolo T | 2013-12-18 | 2 | -1473/+1282 |
|/| | | | | | | | | corrections to italian translation | ||||
| * | | corrections to italian translation | p.tacconi | 2013-12-18 | 2 | -1473/+1282 |
| | | | |||||
* | | | split off mod_connections into mod_connections & mod_connedit - lots of ↵ | friendica | 2013-12-18 | 9 | -545/+160 |
| | | | | | | | | | | | | links to fix | ||||
* | | | split mod/connections for comanchification | friendica | 2013-12-17 | 1 | -0/+708 |
| | | | |||||
* | | | more comanche stuff | friendica | 2013-12-17 | 4 | -6/+2 |
| | | | |||||
* | | | Merge https://github.com/friendica/red into zpull | friendica | 2013-12-17 | 1 | -4/+7 |
|\ \ \ | |||||
| * \ \ | Merge pull request #244 from zzottel/master | friendica | 2013-12-17 | 1 | -4/+7 |
| |\ \ \ | | | | | | | | | | | JS-less display module | ||||
| | * | | | JS-less display | zottel | 2013-12-17 | 1 | -4/+7 |
| |/ / / | |||||
* / / / | authtest: do a better job of success/failure indication | friendica | 2013-12-17 | 3 | -3/+8 |
|/ / / | |||||
* | | | There's always more to do... | friendica | 2013-12-16 | 1 | -0/+2 |
| | | | |||||
* | | | Merge https://github.com/friendica/red into zpull | friendica | 2013-12-16 | 2 | -91/+35 |
|\ \ \ | |||||
| * \ \ | Merge pull request #243 from git-marijus/master | friendica | 2013-12-16 | 2 | -91/+35 |
| |\ \ \ | | | | | | | | | | | some more style.css work | ||||
| | * | | | move some stuff back to mod_connections.css | marijus | 2013-12-16 | 2 | -34/+31 |
| | | | | | |||||
| | * | | | remove some cruft and a typo | marijus | 2013-12-16 | 1 | -57/+4 |
| | | | | | |||||
| | * | | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2013-12-16 | 29 | -169/+1125 |
| | |\ \ \ |