aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* apply service class restriction to the number of channels allowed in a chatro...friendica2014-02-061-0/+11
* 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
* 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 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
| |\ \ \
| | * | | 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 noti...friendica2014-02-051-1/+10
|/ / / / / / / / / / / /
* | | | | | | | | | | | 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
* | | | | | | | | | | | bookmarks - mop up and go homefriendica2014-02-049-5/+66
* | | | | | | | | | | | bookmarkingfriendica2014-02-047-15/+126
* | | | | | | | | | | | fix the search for system bookmarksfriendica2014-02-041-3/+9
* | | | | | | | | | | | Merge https://github.com/friendica/red into zpullfriendica2014-02-042-1134/+1188
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge pull request #301 from tobiasd/20140204tobiasd2014-02-032-1134/+1188
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | DE: update to the stringsTobias Diekershoff2014-02-042-1134/+1188
| |/ / / / / / / / / / /
* / / / / / / / / / / / bookmark permissionsfriendica2014-02-048-4/+25
|/ / / / / / / / / / /
* | | | | | | | | | | photo tagging somewhat working - but can't remove photo tags until we update ...friendica2014-02-032-7/+27
* | | | | | | | | | | some tagging fixes - including old bugs which were never reportedfriendica2014-02-032-6/+6
* | | | | | | | | | | transmit, receive, and parse bookmarksfriendica2014-02-034-10/+39
* | | | | | | | | | | accept new connection broke yesterdayfriendica2014-02-034-4/+10
| |_|_|_|_|_|_|/ / / |/| | | | | | | | |
* | | | | | | | | | code cleanup - remove some unused functionsfriendica2014-02-032-37/+1
| |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | The problem with a lot of packages is that it's easier to re-write them than ...friendica2014-02-022-4/+39
* | | | | | | | | more wordsmithingfriendica2014-02-021-1/+1