aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #129 from MicMee/masterfriendica2013-09-122-1/+8
|\
| * implement tip from Mike, corrected the sql statementMichael Meer2013-09-111-1/+1
| * delete logger line; was the wrong place.Michael Meer2013-09-111-1/+0
| * flag failed auth attempts in DB table hublocMichael Meer2013-09-112-1/+9
* | assuming this doesn't blow up the internet like the last fix - this is a very...friendica2013-09-112-2/+2
|/
* make comments work againfriendica2013-09-101-1/+2
* well that really stuffed things up...friendica2013-09-102-3/+3
* remove old debugging cruftfriendica2013-09-101-1/+1
* this should fix the foreign language like notifications (again)friendica2013-09-101-2/+4
* change wording on item_store message so we can find failures fast with grep i...friendica2013-09-101-1/+1
* provide detailed error to remote site for the myriad of things that can go wr...friendica2013-09-1010-32/+72
* Merge https://github.com/friendica/red into zpullfriendica2013-09-1011-17/+20
|\
| * Merge pull request #126 from MicMee/masterfriendica2013-09-103-6/+11
| |\
| | * extends DB in hubloc to maintain hubloc connectivityMichael Meer2013-09-103-6/+11
| * | Merge pull request #128 from oohlaf/fixesOlaf Conradi2013-09-101-2/+1
| |\ \
| | * | No need to add name_updated twice in zfinger responseOlaf Conradi2013-09-111-2/+1
| |/ /
| * | Merge pull request #127 from git-marijus/masterfriendica2013-09-101-3/+2
| |\ \
| | * | make /channel respect "Maximum number of conversations to load at any time" s...marijus2013-09-101-3/+2
| |/ /
| * / Admin templates.Thomas Willingham2013-09-106-6/+6
| |/
* / z_fetch_url - include curl debug info in return array and log it (at logger_d...friendica2013-09-102-1/+11
|/
* site rename issuefriendica2013-09-091-1/+2
* Merge https://github.com/friendica/red into zpullfriendica2013-09-091-1/+1
|\
| * Merge pull request #125 from cvogeley/mastercvogeley2013-09-091-1/+1
| |\
| | * usage message showed wrong number of channelsChristian Vogeley2013-09-091-1/+1
* | | quick fix to directoryfriendica2013-09-091-3/+3
|/ /
* | Merge https://github.com/friendica/red into zpullfriendica2013-09-092-1/+12
|\ \
| * \ Merge pull request #122 from MicMee/masterfriendica2013-09-092-1/+12
| |\ \
| | * | Preparation to maintain HubLocs from adminpanel. This should act as basis for...Michael Meer2013-09-091-0/+11
| | * | just a typoMichael Meer2013-09-091-1/+1
| |/ /
* / / change primary key on updates tablefriendica2013-09-093-3/+12
|/ /
* | some alteration to the way directory sync was originally supposed to work. I'...friendica2013-09-092-26/+15
* | fix the sitename alsofriendica2013-09-081-1/+1
* | fix the recipient and subject localisation of failed update emailsfriendica2013-09-081-3/+3
* | change from refresh_all to a directory update - which does a refresh_all and ...friendica2013-09-081-1/+3
* | perform a refresh_all when an import has completed so that all your connectio...friendica2013-09-082-3/+4
* | make sure new contacts who are not yet in the address book are sync'd across ...friendica2013-09-081-0/+14
* | Merge https://github.com/friendica/red into zpullfriendica2013-09-082-0/+92
|\ \
| * \ Merge pull request #120 from beardy-unixer/masterfriendica2013-09-082-0/+92
| |\ \
| | * | Kill loggerThomas Willingham2013-09-091-3/+0
| | * | Quick and dirty file storage module.Thomas Willingham2013-09-092-0/+95
| |/ /
* / / description of the chanman module and what it will need to do.friendica2013-09-081-0/+29
|/ /
* | rev updatefriendica2013-09-081-1/+1
* | Merge pull request #119 from unary/categorywidgetfriendica2013-09-081-2/+9
|\ \
| * | added dbescMichael Johnston2013-09-081-1/+1
| * | only show categories this channel has usedMichael Johnston2013-09-081-2/+9
* | | Merge pull request #118 from cvogeley/masterfriendica2013-09-089-14/+105
|\ \ \ | | |/ | |/|
| * | .Christian Vogeley2013-09-081-1/+1
| * | retrun checkChristian Vogeley2013-09-081-0/+1
| * | Merge service classChristian Vogeley2013-09-089-14/+104
|/| |
| * | Service class itemsChristian Vogeley2013-09-082-1/+49