aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | Merge remote-tracking branch 'upstream/master'Thomas Willingham2013-12-18827-17329/+33904
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: mod/page.php
| | * | | Copy paste from one terminal to another changed tab to whitespace.Thomas Willingham2013-11-151-7/+7
| | | | |
| | * | | Still use page_display.tpl for pages.Thomas Willingham2013-11-151-2/+11
| | | | |
* | | | | js functions behind quick permission links were lost in comanchification ↵friendica2013-12-222-82/+82
|/ / / / | | | | | | | | | | | | process - because the js didn't get relocated to the new connedit module
* | | | last remaining files to be Comanchified with the exception of mod_admin. ↵friendica2013-12-224-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.friendica2013-12-224-6/+14
| | | |
* | | | split private messages into two modules - "message" is just for message ↵friendica2013-12-2115-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 ↵friendica2013-12-205-13/+44
| | | | | | | | | | | | | | | | message needs to be split.
* | | | comanchify mod_search - we've got three modules left to Comanchify: admin, ↵friendica2013-12-204-1199/+1060
| | | | | | | | | | | | | | | | directory and message - each of which introduces "interesting challenges"
* | | | doc updatesfriendica2013-12-20122-909/+1288
| | | |
* | | | comanchify connedit, groupfriendica2013-12-196-28/+42
| | | |
* | | | sourced items which are then edited at the source weren't setting up the ↵friendica2013-12-191-1/+8
| | | | | | | | | | | | | | | | second delivery chain.
* | | | default photo issue, and connections page showing deleted accounts. Also ↵friendica2013-12-195-6/+12
| | | | | | | | | | | | | | | | show last updated on connedit page
* | | | add bbcode referencefriendica2013-12-192-0/+69
| | | |
* | | | give doc/help alternate mimetype supportfriendica2013-12-191-3/+24
| | | |
* | | | comanchificate mod_photosfriendica2013-12-194-27/+29
| | | |
* | | | make default profile photo configurable - should be functional but needs ↵friendica2013-12-1912-120/+31
| | | | | | | | | | | | | | | | admin ui
* | | | add 'src' parameter to api photo listfriendica2013-12-191-1/+4
| | | |
* | | | if somebody tagged you in a private post, the tag email notification ↵friendica2013-12-191-3/+2
| | | | | | | | | | | | | | | | contained the obscured message. Clear it.
* | | | more comanchefriendica2013-12-193-18/+10
| | | |
* | | | more comanchefriendica2013-12-193-7/+8
| | | |
* | | | more comanche migrationfriendica2013-12-1914-128/+59
| | | |
* | | | provide git revision in siteinfo if possible and if not instructed otherwisefriendica2013-12-182-5/+17
| | | |
* | | | remove the .wgl (widget list) file processing for ordering widgets on a ↵friendica2013-12-181-37/+1
| | | | | | | | | | | | | | | | page. This preceded Comanche and was never used and is now obsolete.
* | | | Merge https://github.com/friendica/red into zpullfriendica2013-12-185-1492/+1295
|\ \ \ \
| * \ \ \ Merge pull request #246 from git-marijus/masterfriendica2013-12-183-19/+13
| |\ \ \ \ | | |_|/ / | |/| | | minor fixes
| | * | | show drop-icon on wall-item hover onlymarijus2013-12-182-6/+10
| | | | |
| | * | | we make this with css nowmarijus2013-12-181-11/+1
| | | | |
| | * | | fix a typomarijus2013-12-182-2/+2
| |/ / /
| * | | Merge pull request #245 from tuscanhobbit/masterPaolo T2013-12-182-1473/+1282
| |\ \ \ | | | | | | | | | | corrections to italian translation
| | * | | corrections to italian translationp.tacconi2013-12-182-1473/+1282
| | | | |
* | | | | Add App::poi to store the "person of interest" for a given page. This is so ↵friendica2013-12-184-32/+31
|/ / / / | | | | | | | | | | | | we can comanchificate the vcard_from_xchan widget -- it will pick up the target xchan from the page environment.
* | | | split off mod_connections into mod_connections & mod_connedit - lots of ↵friendica2013-12-189-545/+160
| | | | | | | | | | | | | | | | links to fix
* | | | split mod/connections for comanchificationfriendica2013-12-171-0/+708
| | | |
* | | | more comanche stufffriendica2013-12-174-6/+2
| | | |
* | | | Merge https://github.com/friendica/red into zpullfriendica2013-12-171-4/+7
|\ \ \ \
| * \ \ \ Merge pull request #244 from zzottel/masterfriendica2013-12-171-4/+7
| |\ \ \ \ | | | | | | | | | | | | JS-less display module
| | * | | | JS-less displayzottel2013-12-171-4/+7
| |/ / / /
* / / / / authtest: do a better job of success/failure indicationfriendica2013-12-173-3/+8
|/ / / /
* | | | There's always more to do...friendica2013-12-161-0/+2
| | | |
* | | | Merge https://github.com/friendica/red into zpullfriendica2013-12-162-91/+35
|\ \ \ \
| * \ \ \ Merge pull request #243 from git-marijus/masterfriendica2013-12-162-91/+35
| |\ \ \ \ | | | | | | | | | | | | some more style.css work
| | * | | | move some stuff back to mod_connections.cssmarijus2013-12-162-34/+31
| | | | | |
| | * | | | remove some cruft and a typomarijus2013-12-161-57/+4
| | | | | |
| | * | | | Merge branch 'master' of https://github.com/friendica/redmarijus2013-12-1629-169/+1125
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2013-12-144-5/+29
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2013-12-13114-2297/+2429
| | |\ \ \ \ \ \
* | | | | | | | | Tricky little bug. Allowed somebody to bypass comment permissions. Hopefully ↵friendica2013-12-161-3/+4
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | the fix will have no undesired side effects.
* | | | / / / / bring back the collection edit sidebar widget on the connection edit page ↵friendica2013-12-161-1/+1
| |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | until I sort out Comanche on that page.
* | | | | | | install redbasic during setup so that at least one theme is registered. ↵friendica2013-12-162-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise none of the display settings seem to work very well.