aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #89 from pixelroot/masterfriendica2013-08-061-6559/+4136
|\
| * modified: view/ru/messages.popixelroot2013-08-061-10/+10
| * modified: view/ru/messages.popixelroot2013-08-061-6559/+4136
* | convert all stored json calls to json_decode_plus()friendica2013-08-066-24/+24
* | we've been storing json_encoded structures on disk in several places because ...friendica2013-08-064-7/+14
* | add extra logging to tag_deliverfriendica2013-08-051-2/+6
* | fine tuning the error checksfriendica2013-08-051-1/+6
* | keep total of imported xchans correct - even if one or mail failures occurfriendica2013-08-051-4/+7
* | more error checking in case import_xchan failsfriendica2013-08-051-0/+8
* | use url part of arrayfriendica2013-08-051-1/+1
* | put rotated/compressed logs (.gz) into ignore listfriendica2013-08-051-0/+1
* | prune old suggested channelsfriendica2013-08-051-0/+10
* | populate initial suggestions (ultimately we want to do this at install time a...friendica2013-08-056-88/+96
* | Merge https://github.com/friendica/red into zpullfriendica2013-08-050-0/+0
|\ \
| * | Issue #88Thomas Willingham2013-08-051-1/+1
* | | enotify: localize things we know how to translatefriendica2013-08-054-9/+15
|/ /
* | directory server sitelist module (needed for public site list and building fr...friendica2013-08-042-0/+52
* | js_upload is wretched, but at least fix the HTML in the template so it will w...friendica2013-08-041-1/+1
* | progress on unfriendingfriendica2013-08-042-21/+34
* | Merge https://github.com/friendica/red into zpullfriendica2013-08-041-5/+1
|\ \
| * | Template boo-booThomas Willingham2013-08-041-5/+1
* | | basic *account* removal, but the channel removal which it calls still needs (...friendica2013-08-044-24/+52
|/ /
* | don't show connections with removed xchans - as there isn't much to seefriendica2013-08-042-31/+30
* | $yoursite/~foo has taken you to foo's channel page for ages. If you're logged...friendica2013-08-042-4/+11
* | connect link in directoryfriendica2013-08-033-4/+27
* | doc updatesfriendica2013-08-039-13/+13
* | Merge https://github.com/friendica/red into zpullfriendica2013-08-033-349/+160
|\ \
| * \ Merge pull request #87 from cvogeley/masterfriendica2013-08-033-349/+160
| |\ \
| | * | change back mod to 644Christian Vogeley2013-08-032-0/+0
| | * | Revert "Revert "merge""Christian Vogeley2013-08-03119-1512/+1510
| | * | Revert "merge"Christian Vogeley2013-08-03119-1510/+1512
| | * | mergeChristian Vogeley2013-08-03119-1512/+1510
| | |\ \
| | * | | Check existance of bbcode tags before executing regexes, to avoid unnecessary...Christian Vogeley2013-07-281-109/+160
| | * | | .Christian Vogeley2013-07-272-0/+143
| | * | | don't know why they were marked as changedChristian Vogeley2013-07-272-143/+0
| | * | | don't why they were marked as changedChristian Vogeley2013-07-272-240/+0
* | | | | rev updatefriendica2013-08-031-1/+1
|/ / / /
* | / / Make Zot a bit more prominent in the READMEfriendica2013-08-021-0/+1
| |/ / |/| |
* | | basic email invitations - and doc updatefriendica2013-08-0226-378/+393
* | | potentially fixes the "federation" bug w/r/t/ tagged forumsfriendica2013-08-011-2/+2
* | | minor - change nav_set_selected() to only highlight intros if on that particu...friendica2013-08-011-1/+1
* | | pass item by reference so title can be alteredfriendica2013-08-012-13/+21
* | | ensure that no unencrypted content leaks through item_store which is private ...friendica2013-08-014-12/+28
* | | add "xchan_instance_url" for communicating with services that lack nomadic id...friendica2013-08-013-2/+11
* | | Merge https://github.com/friendica/red into zpullfriendica2013-08-016-17/+61
|\ \ \
| * \ \ Merge pull request #86 from beardy-unixer/masterfriendica2013-08-013-15/+57
| |\ \ \
| | * | | Remove loggingThomas Willingham2013-08-011-1/+0
| | * | | "Can edit my webpages" permissionsThomas Willingham2013-08-013-15/+58
| * | | | Merge pull request #85 from git-marijus/masterfriendica2013-08-013-2/+4
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | make "selected" class work on all navigation menu itemsmarijus2013-08-013-2/+4
| |/ / /