aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 ↵friendica2014-02-073-2804/+2919
| | | | | | | | cert. If you don't make the cut, you will either not be listed as a public site or you will be de-listed. Period. This is non-negotiable.
| * 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 ↵Thomas Willingham2014-02-071-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | for mounting one's own directory rather than the cloud root.
| * | | extend the usermenu so we don't have to keep going back to channel homepage ↵friendica2014-02-061-3/+7
| | |/ | |/| | | | | | | to get to the other channel links
| * | make all naked links bookmark-ablefriendica2014-02-062-2/+2
| |/
| * apply service class restriction to the number of channels allowed in a ↵friendica2014-02-061-0/+11
| | | | | | | | chatroom at a time ('chatters_inroom'). If you've got a public site you probably want to restrict this.
* | 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
| | | | | | | | red links are linkified when the post is submitted. Can't do this for other naked links because they only get linkified during display and won't have a taxonomy object attached to the message.
| * notification bug - don't use $r, we already set it to something else that we ↵friendica2014-02-062-3/+6
| | | | | | | | need further on.
* | Merge branch 'master' of https://github.com/friendica/red into upstreammarijus2014-02-0615-220/+213
|\|
| * 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
| |
| * 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 ↵friendica2014-02-051-4/+10
| | | | | | | | | | | | bookmarks for self
| * | 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 devices
| | | * | Other not so elegant way of detecting touch screen devicesChristian Vogeley2014-02-021-2/+13
| | | | | | | | | | | | | | | | | | | | But at least it seems to work
| | * | | Merge pull request #302 from git-marijus/masterfriendica2014-02-062-0/+59
| | |\ \ \ | | | | | | | | | | | | add a sanitized style tag to bbcode
| | | * | | add a sanitized style tag to bbcodemarijus2014-02-052-0/+59
| | | | | |
| | | * | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-02-0523-26/+244
| | | |\ \ \ | | | |/ / / | | |/| | |
| | | * | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-02-0412-1161/+1270
| | | |\ \ \
| | | * \ \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-02-032-37/+1
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-02-0319-95/+221
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-02-023-10/+21
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-02-021-10/+8
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-02-023-10/+36
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-02-0213-24/+87
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-02-0197-2342/+3605
| | | |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | This would be about the 75th attempt to try and prevent duplicated email ↵friendica2014-02-051-1/+10
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notifications for comments. Eventually we'll find something that works.
* | | | | | | | | | | | | Merge branch 'master' of https://github.com/friendica/red into upstreammarijus2014-02-05143-3694/+5472
|\| | | | | | | | | | | |
| * | | | | | | | | | | | preserve system bit when editing menusfriendica2014-02-052-1/+8
| | | | | | | | | | | | |
| * | | | | | | | | | | | bookmarking bugfixfriendica2014-02-052-7/+10
| | | | | | | | | | | | |
| * | | | | | | | | | | | bookmark debug loggingfriendica2014-02-053-7/+9
| | | | | | | | | | | | |
| * | | | | | | | | | | | make links in comments bookmark-ablefriendica2014-02-044-5/+11
| | | | | | | | | | | | |
| * | | | | | | | | | | | add icon translation for new iconfriendica2014-02-041-0/+1
| | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-10 13:31:24 +0000