aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'upstream/master'zottel2012-04-0341-276/+471
|\
| * make contact ssl_policy change a function since it is used in a few placesfriendica2012-04-024-129/+52
| * more ssl policy fixes and prevent delivery to soapbox when using local deliveryfriendica2012-04-023-5/+100
| * don't change ssl settings on local photos for remote contactfriendica2012-04-021-9/+0
| * bug #363 and a couple of other reported ssl link issuesfriendica2012-04-022-2/+33
| * diabook-themes: css-fixestommy tomson2012-04-0224-20/+125
| * diabook-themes: fixes in jstommy tomson2012-04-024-112/+115
| * diabook-themes: fixed pageheadertommy tomson2012-04-0217-68/+98
| * diabook-themes: bugfixes / css-fixestommy tomson2012-04-0217-17/+30
| * make the "new calendar" (javascript interactive) the defaultfriendica2012-04-021-4/+4
| * remove zrl from query stringfriendica2012-04-022-0/+4
* | Merge remote branch 'upstream/master'zottel2012-04-02115-313/+12740
|\|
| * catch a couple more Oo smiliesfriendica2012-04-011-0/+4
| * add page_content_top hookfriendica2012-04-011-0/+2
| * add title to D* postsfriendica2012-04-011-1/+5
| * Merge pull request #200 from unary/categoriesfriendica2012-04-0111-18/+226
| |\
| | * allow users to set categories on their postsMichael Johnston2012-04-0111-18/+226
| |/
| * Merge pull request #199 from beardy-unixer/1457d6e90f36a6a7bb07df3579b6e5c047...friendica2012-04-011-2/+4
| |\
| | * Modified peopleyouknow to handle sites without Facebook betterThomas Willingham2012-04-021-2/+4
| * | Merge pull request #198 from beardy-unixer/masterfriendica2012-04-019-3/+85
| |\|
| | * Merge remote-tracking branch 'upstream/master'Thomas Willingham2012-04-02278-1440/+32270
| | |\ | | |/ | |/|
| * | diabook-themes: add link to global dir in "find friends" at right_asidetommy tomson2012-04-0212-12/+20
| * | check for style.php existence before inclusionfriendica2012-04-011-1/+2
| * | Merge branch 'pull'friendica2012-04-0137-236/+1125
| |\ \
| | * | css-fixestommy tomson2012-04-027-12/+13
| | * | Merge pull request #197 from tomtom84/mastertomtom842012-04-0125-8/+683
| | |\ \
| | | * | add new messages-layout in diabooktommy tomson2012-04-0125-8/+683
| | |/ /
| | * | Merge pull request #196 from tomtom84/mastertomtom842012-04-0116-222/+435
| | |\ \
| | | * | fix the display of community-plugin in diabook-themestommy tomson2012-04-0116-222/+435
| | |/ /
| * / / slight improvement in handling of plaintext feedsfriendica2012-04-012-3/+10
| |/ /
| * | that didn't quite work outfriendica2012-04-011-2/+2
| * | Merge branch 'pull'friendica2012-04-0111-46/+69
| |\ \
| | * \ Merge pull request #195 from tomtom84/mastertomtom842012-04-0111-46/+69
| | |\ \
| | | * | various bugfixes and css-fixestommy tomson2012-04-0111-46/+69
| | |/ /
| * / / document tinymce fixes/workaroundsfriendica2012-04-011-1/+5
| |/ /
| * | qcomment overflowfriendica2012-04-011-0/+8
| * | try slightly better detection of html in feedsfriendica2012-04-011-3/+4
| * | Merge branch 'pull'friendica2012-04-016-12/+32
| |\ \
| | * \ Merge pull request #194 from simonlnu/masterSimon2012-04-015-11/+31
| | |\ \
| | | * | latest fixes for dispys. tweaking/repairingSimon L'nu2012-04-015-11/+31
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-012-9/+6
| | | |\ \ | | | |/ / | | |/| |
| | * | | line 86: s/Friendika/Friendica/Simon2012-04-011-1/+1
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-3145-94/+10852
| | | |\ \
| | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-310-0/+0
| * | | | | send unverified private mail using zrlfriendica2012-04-0110-6/+387
| |/ / / /
| * | / / fix "between yourself and You" in mail listfriendica2012-03-311-8/+5
| | |/ / | |/| |
| * | | more error handlingfriendica2012-03-312-1/+4
| * | | ensure all new users get a timezone. We'll use UTC until they choose otherwise.friendica2012-03-312-2/+6
| * | | handle escaped file chars in display and searchfriendica2012-03-315-13/+10
| * | | Merge branch 'pull'friendica2012-03-3112-0/+10498
| |\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 00:13:27 +0000