aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* revert config changes, we're getting duplicate keysfriendica2012-04-061-151/+147
* Merge branch 'pull'friendica2012-04-051503-158/+179
|\
| * Merge branch 'master' of https://github.com/friendica/friendicaAlexander Kampmann2012-04-051809-6998/+48636
| |\
| * | added index to config and pconfig tableAlexander Kampmann2012-04-054-160/+178
* | | add network_tabs hookfriendica2012-04-051-2/+6
* | | pass autoname(0) testfriendica2012-04-051-0/+3
* | | rev updatefriendica2012-04-052-14/+14
| |/ |/|
* | make 'PHP "register_argc_argv"' easier to translate, may require fix for po2phpfriendica2012-04-052-1/+3
* | Merge pull request #207 from simonlnu/masterSimon2012-04-042-4/+24
|\ \
| * | finish styling category tags and category inputSimon L'nu2012-04-052-0/+20
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-052-0/+12
| |\ \ | |/ / |/| |
* | | also block outboundfriendica2012-04-041-0/+5
* | | let's catch d* disabled at a higher level and not waste any resources on it.friendica2012-04-041-0/+7
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-040-0/+0
| |\ \ | |/ / |/| |
* | | Merge pull request #206 from simonlnu/masterSimon2012-04-0419-131/+188
|\ \ \
| | * | style categorytagsSimon L'nu2012-04-042-4/+4
| |/ /
| * | 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