aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'upstream/master'Michael Vogel2012-04-071393-1443/+3554
|\
| * Merge pull request #212 from tomtom84/mastertomtom842012-04-0737-79/+1373
| |\ | | | | | | fixes in diabook-themes
| | * changelog 1.014 :tommy tomson2012-04-0737-79/+1373
| |/ | | | | | | | | | | | | | | | | | | | | | | image-rezise via jquery-plugin in stream comments under uploaded pictues add Diabook's version-number in head-section css-fixes: tabs youtube-iframe title-bar in jot-wrapper blockquote & .oembed
| * ignore utf8 offset error for unit testsfriendica2012-04-071-1/+3
| |
| * had arg order backwardsfriendica2012-04-071-1/+1
| |
| * try assertContainsfriendica2012-04-071-1/+1
| |
| * tag tests cont.friendica2012-04-072-5/+15
| |
| * fix autonamenegativelength testfriendica2012-04-071-1/+1
| |
| * some work on testsfriendica2012-04-077-68/+77
| |
| * ignore removed pluginsfriendica2012-04-061-2/+9
| |
| * Merge branch 'pull'friendica2012-04-06176-73/+154
| |\
| | * Merge pull request #211 from tomtom84/mastertomtom842012-04-060-0/+0
| | |\ | | | | | | | | small fix
| | | * Merge remote-tracking branch 'origin/master'tommy tomson2012-04-060-0/+0
| | | |\ | | | |/ | | |/|
| | * | Merge pull request #210 from tomtom84/mastertomtom842012-04-06174-54/+135
| | |\ \ | | | | | | | | | | fixes in diabook-derivates
| | | | * Merge remote-tracking branch 'origin/master'tommy tomson2012-04-064-24/+29
| | | | |\ | | | |_|/ | | |/| |
| | * | | Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-04-063-156/+157
| | |\ \ \
| | * | | | small fixes for the German stringsTobias Diekershoff2012-04-062-19/+19
| | | | | |
| | | | | * Merge remote-tracking branch 'origin/master'tommy tomson2012-04-061-151/+147
| | | | |/|
| | | | * | new-contacts-introductions in contacts-drop-down and new-messages in ↵tommy tomson2012-04-06174-54/+135
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | messages-drop-down get each an additional indicator... profile-picture is now scaled right in firefox... fixed broken css on introductions-page in firefox...
| * | | | fix messed up config tables w/ duplicate entriesfriendica2012-04-063-6/+51
| | |/ / | |/| |
| * | | fix bad sql updatefriendica2012-04-062-5/+10
| | |/ | |/|
| * | Merge branch 'pull'friendica2012-04-062-1216/+1850
| |\|
| | * update to the German stringsTobias Diekershoff2012-04-062-1216/+1850
| | |
| * | 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
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: include/config.php update.php
| | * | added index to config and pconfig tableAlexander Kampmann2012-04-054-160/+178
| | | | | | | | | | | | | | | | changed config.php to use REPLACE instead of INSERT, this removes one db hit.
| * | | add network_tabs hookfriendica2012-04-051-2/+6
| | | |
| * | | pass autoname(0) testfriendica2012-04-051-0/+3
| | | |
| * | | rev updatefriendica2012-04-052-14/+14
| | |/ | |/|
* | | "vier": Bookmarks now look better.Michael Vogel2012-04-072-0/+10
| | |
* | | Merge commit 'upstream/master'Michael Vogel2012-04-06102-4851/+1753
|\| |
| * | 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
| |\ \ | | | | | | | | styled cat tags and input
| | * | finish styling category tags and category inputSimon L'nu2012-04-052-0/+20
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-052-0/+12
| | |\ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: also block outbound let's catch d* disabled at a higher level and not waste any resources on it. * master:
| * | | 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
| | |\ \ | | |/ / | |/| | | | | | | | | | | | | | * remotes/upstream/master: * master:
| * | | Merge pull request #206 from simonlnu/masterSimon2012-04-0419-131/+188
| |\ \ \ | | | | | | | | | | update the template files
| | | * | style categorytagsSimon L'nu2012-04-042-4/+4
| | |/ / | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * | update the dispy* templatesSimon L'nu2012-04-0419-131/+188
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-044-4/+13
| | |\ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: correct some filer dialog weirdness caused by introduction of categories move alert box away from nav links log disabled requests fix config storage of booleans * master:
| * | | Merge pull request #205 from unary/filerfixfriendica2012-04-041-1/+2
| |\ \ \ | | | | | | | | | | correct some filer dialog weirdness caused by introduction of categories
| | * | | 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
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: well that was a stupid mistake... string update bug: diaspora_enabled setting turns it on but doesn't fully turn it off. better handling of reshares containing embeds * master:
| * | well that was a stupid mistake...friendica2012-04-041-1/+1
| | |