aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #304 from git-marijus/masterfriendica2014-02-082-6/+6
|\
| * Merge branch 'upstream'marijus2014-02-07115-9003/+9513
| |\
| | * let oneself be added to a collection in exchange for deleted contactsmarijus2014-02-072-6/+6
| | * Merge branch 'master' of https://github.com/friendica/red into upstreammarijus2014-02-072-4017/+4207
| | |\ | |_|/ |/| |
* | | Merge pull request #303 from tuscanhobbit/masterPaolo T2014-02-072-4017/+4207
|\ \ \
| * \ \ IT: update to the stringstuscanhobbit2014-02-070-0/+0
| |\ \ \
| * | | | IT: update to the stringstuscanhobbit2014-02-072-3857/+4049
| | | | * Merge branch 'master' of https://github.com/friendica/red into upstreammarijus2014-02-07110-4976/+5293
| | | | |\ | |_|_|_|/ |/| | | |
* | | | | order menu_list by description, not namefriendica2014-02-071-1/+1
* | | | | To be listed as a public site, you need to be an https site with a valid cert...friendica2014-02-073-2804/+2919
* | | | | doc updatesfriendica2014-02-0799-2159/+2337
* | | | | missing element in new chatroom linkfriendica2014-02-061-1/+4
* | | | | mod/ping - don't perform any database calls if installingfriendica2014-02-061-0/+6
* | | | | Merge https://github.com/friendica/red into zpullfriendica2014-02-061-6/+6
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-02-072-2/+2
| |\ \ \ \ \
| * | | | | | Minor doco - markdown doesn't like angle brackets. Also give instructions fo...Thomas Willingham2014-02-071-6/+6
* | | | | | | extend the usermenu so we don't have to keep going back to channel homepage t...friendica2014-02-061-3/+7
| |/ / / / / |/| | | | |
* | | | | | make all naked links bookmark-ablefriendica2014-02-062-2/+2
|/ / / / /
* | | | | apply service class restriction to the number of channels allowed in a chatro...friendica2014-02-061-0/+11
| | | | * Merge branch 'master' of https://github.com/friendica/red into upstreammarijus2014-02-062-4/+7
| | | | |\ | |_|_|_|/ |/| | | |
* | | | | add bookmark tag to naked links if they're red sites. We can do this because ...friendica2014-02-061-1/+1
* | | | | notification bug - don't use $r, we already set it to something else that we ...friendica2014-02-062-3/+6
| | | | * Merge branch 'master' of https://github.com/friendica/red into upstreammarijus2014-02-0615-220/+213
| | | | |\ | |_|_|_|/ |/| | | |
| | | * | Merge branch 'master' of https://github.com/friendica/redmarijus2014-02-062-1/+2
| | | |\ \ | |_|_|/ / |/| | | |
* | | | | leave out the quotesfriendica2014-02-061-1/+1
* | | | | more important things to mention. And this is still only the important stuff.friendica2014-02-062-1/+2
| | | * | Merge branch 'master' of https://github.com/friendica/redmarijus2014-02-0612-219/+152
| | | |\ \ | |_|_|/ / |/| | | |
* | | | | a couple morefriendica2014-02-052-0/+3
* | | | | Merge branch 'newhomepage'friendica2014-02-052-206/+72
|\ \ \ \ \
| * | | | | this is basic but perhaps that's what we really need.friendica2014-02-051-15/+62
| * | | | | cleanup in preparation for new pagefriendica2014-02-021-196/+3
| * | | | | some intial work on a splashier homepagefriendica2014-01-222-14/+26
* | | | | | add chatrooms templatefriendica2014-02-051-0/+10
* | | | | | add chatroom linksfriendica2014-02-052-1/+24
* | | | | | fix the xchan lookup toolfriendica2014-02-051-1/+3
* | | | | | allow bookmarks to use richtextfriendica2014-02-053-3/+6
* | | | | | cleanup - nothing morefriendica2014-02-051-3/+3
* | | | | | fix auto-add of bookmarks to find sender correctly and optionally auto add bo...friendica2014-02-051-4/+10
* | | | | | Merge https://github.com/friendica/red into zpullfriendica2014-02-053-2/+72
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #298 from cvogeley/masterfriendica2014-02-061-2/+13
| |\ \ \ \ \ \
| | * | | | | | Other not so elegant way of detecting touch screen devicesChristian Vogeley2014-02-021-2/+13
| * | | | | | | Merge pull request #302 from git-marijus/masterfriendica2014-02-062-0/+59
| |\ \ \ \ \ \ \
* | | | | | | | | This would be about the 75th attempt to try and prevent duplicated email noti...friendica2014-02-051-1/+10
|/ / / / / / / /
| | | | | | * / Merge branch 'upstream'marijus2014-02-050-0/+0
| | |_|_|_|/| | | |/| | | | |/
| | | | | | * Merge branch 'master' of https://github.com/friendica/red into upstreammarijus2014-02-05143-3694/+5472
| | | | | | |\ | |_|_|_|_|_|/ |/| | | | | |
| | | | | | * comment out since it is not clear if this is not implemented yet or obsoletemarijus2014-01-311-2/+2
| * | | | | | add a sanitized style tag to bbcodemarijus2014-02-052-0/+59
| * | | | | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-02-0523-26/+244
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | preserve system bit when editing menusfriendica2014-02-052-1/+8
* | | | | | | bookmarking bugfixfriendica2014-02-052-7/+10
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-30 22:55:36 +0000