aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #206 from simonlnu/masterSimon2012-04-0419-131/+188
|\
| * update the dispy* templatesSimon L'nu2012-04-0419-131/+188
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-044-4/+13
| |\ | |/ |/|
* | Merge pull request #205 from unary/filerfixfriendica2012-04-041-1/+2
|\ \
| * | correct some filer dialog weirdness caused by introduction of categoriesMichael Johnston2012-04-041-1/+2
|/ /
* | move alert box away from nav linksfriendica2012-04-041-1/+4
* | log disabled requestsfriendica2012-04-041-2/+6
* | fix config storage of booleansfriendica2012-04-041-0/+1
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-040-0/+0
|/
* well that was a stupid mistake...friendica2012-04-041-1/+1
* string updatefriendica2012-04-041-733/+1023
* bug: diaspora_enabled setting turns it on but doesn't fully turn it off.friendica2012-04-042-1/+10
* Merge branch 'pull'friendica2012-04-042-20/+38
|\
| * Merge pull request #204 from simonlnu/masterSimon2012-04-032-20/+38
| |\
| | * latest changes are the popup menu for notifs, fixesSimon L'nu2012-04-042-20/+38
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-0472-3950/+404
| | |\ | | |/ | |/|
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-022-2/+33
| | |\
| | * \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-0235-217/+378
| | |\ \
| | * \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-0134-35/+340
| | |\ \ \
| | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-010-0/+0
* | | | | | better handling of reshares containing embedsfriendica2012-04-041-8/+8
|/ / / / /
* | | | | display settings hooksfriendica2012-04-031-1/+4
* | | | | re-opened bug #363friendica2012-04-031-0/+10
* | | | | this is betterfriendica2012-04-031-3/+2
* | | | | Merge branch 'pull'friendica2012-04-0324-120/+313
|\ \ \ \ \
| * | | | | smal fixtommy tomson2012-04-031-1/+1
| * | | | | Merge pull request #202 from tomtom84/mastertomtom842012-04-031-0/+8
| |\ \ \ \ \
| | * | | | | german translation for right_asidetommy tomson2012-04-031-0/+8
| * | | | | | Merge pull request #201 from tomtom84/mastertomtom842012-04-0323-119/+304
| |\| | | | |
| | * | | | | make right_aside translatable and provide german translation...tommy tomson2012-04-0323-119/+304
| |/ / / / /
* | | | | | include contact_widgets for categories_widget when doing updatesfriendica2012-04-031-0/+2
* | | | | | remove loozah themes which fell too far behind to recoverfriendica2012-04-0340-3763/+1
|/ / / / /
* | | | | suppress duplicates in searchfriendica2012-04-031-7/+7
* | | | | 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
* | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 01:31:10 +0000