| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge commit 'upstream/master' | Michael Vogel | 2012-04-06 | 102 | -4851/+1753 |
| |\ |
|
| | * | make 'PHP "register_argc_argv"' easier to translate, may require fix for po2php | friendica | 2012-04-05 | 2 | -1/+3 |
| | * | Merge pull request #207 from simonlnu/master | Simon | 2012-04-04 | 2 | -4/+24 |
| | |\ |
|
| | | * | finish styling category tags and category input | Simon L'nu | 2012-04-05 | 2 | -0/+20 |
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-05 | 2 | -0/+12 |
| | | |\
| | |/
| |/| |
|
| | * | | also block outbound | friendica | 2012-04-04 | 1 | -0/+5 |
| | * | | let's catch d* disabled at a higher level and not waste any resources on it. | friendica | 2012-04-04 | 1 | -0/+7 |
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-04 | 0 | -0/+0 |
| | | |\
| | |/
| |/| |
|
| | * | | Merge pull request #206 from simonlnu/master | Simon | 2012-04-04 | 19 | -131/+188 |
| | |\ \ |
|
| | | | * | style categorytags | Simon L'nu | 2012-04-04 | 2 | -4/+4 |
| | | |/ |
|
| | | * | update the dispy* templates | Simon L'nu | 2012-04-04 | 19 | -131/+188 |
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-04 | 4 | -4/+13 |
| | | |\
| | |/
| |/| |
|
| | * | | Merge pull request #205 from unary/filerfix | friendica | 2012-04-04 | 1 | -1/+2 |
| | |\ \ |
|
| | | * | | correct some filer dialog weirdness caused by introduction of categories | Michael Johnston | 2012-04-04 | 1 | -1/+2 |
| | |/ / |
|
| | * | | move alert box away from nav links | friendica | 2012-04-04 | 1 | -1/+4 |
| | * | | log disabled requests | friendica | 2012-04-04 | 1 | -2/+6 |
| | * | | fix config storage of booleans | friendica | 2012-04-04 | 1 | -0/+1 |
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-04 | 0 | -0/+0 |
| | |/ |
|
| | * | well that was a stupid mistake... | friendica | 2012-04-04 | 1 | -1/+1 |
| | * | string update | friendica | 2012-04-04 | 1 | -733/+1023 |
| | * | bug: diaspora_enabled setting turns it on but doesn't fully turn it off. | friendica | 2012-04-04 | 2 | -1/+10 |
| | * | Merge branch 'pull' | friendica | 2012-04-04 | 2 | -20/+38 |
| | |\ |
|
| | | * | Merge pull request #204 from simonlnu/master | Simon | 2012-04-03 | 2 | -20/+38 |
| | | |\ |
|
| | | | * | latest changes are the popup menu for notifs, fixes | Simon L'nu | 2012-04-04 | 2 | -20/+38 |
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-04 | 72 | -3950/+404 |
| | | | |\
| | | |/
| | |/| |
|
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-02 | 2 | -2/+33 |
| | | | |\ |
|
| | | | * \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-02 | 35 | -217/+378 |
| | | | |\ \ |
|
| | | | * \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-01 | 34 | -35/+340 |
| | | | |\ \ \ |
|
| | | | * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-01 | 0 | -0/+0 |
| | * | | | | | | better handling of reshares containing embeds | friendica | 2012-04-04 | 1 | -8/+8 |
| | |/ / / / / |
|
| | * | | | | | display settings hooks | friendica | 2012-04-03 | 1 | -1/+4 |
| | * | | | | | re-opened bug #363 | friendica | 2012-04-03 | 1 | -0/+10 |
| | * | | | | | this is better | friendica | 2012-04-03 | 1 | -3/+2 |
| | * | | | | | Merge branch 'pull' | friendica | 2012-04-03 | 24 | -120/+313 |
| | |\ \ \ \ \ |
|
| | | * | | | | | smal fix | tommy tomson | 2012-04-03 | 1 | -1/+1 |
| | | * | | | | | Merge pull request #202 from tomtom84/master | tomtom84 | 2012-04-03 | 1 | -0/+8 |
| | | |\ \ \ \ \ |
|
| | | | * | | | | | german translation for right_aside | tommy tomson | 2012-04-03 | 1 | -0/+8 |
| | | * | | | | | | Merge pull request #201 from tomtom84/master | tomtom84 | 2012-04-03 | 23 | -119/+304 |
| | | |\| | | | | |
|
| | | | * | | | | | make right_aside translatable and provide german translation... | tommy tomson | 2012-04-03 | 23 | -119/+304 |
| | | |/ / / / / |
|
| | * | | | | | | include contact_widgets for categories_widget when doing updates | friendica | 2012-04-03 | 1 | -0/+2 |
| | * | | | | | | remove loozah themes which fell too far behind to recover | friendica | 2012-04-03 | 40 | -3763/+1 |
| | |/ / / / / |
|
| | * | | | | | suppress duplicates in search | friendica | 2012-04-03 | 1 | -7/+7 |
| | * | | | | | make contact ssl_policy change a function since it is used in a few places | friendica | 2012-04-02 | 4 | -129/+52 |
| | * | | | | | more ssl policy fixes and prevent delivery to soapbox when using local delivery | friendica | 2012-04-02 | 3 | -5/+100 |
| | * | | | | | don't change ssl settings on local photos for remote contact | friendica | 2012-04-02 | 1 | -9/+0 |
| | | |_|_|/
| |/| | | |
|
| | * | | | | bug #363 and a couple of other reported ssl link issues | friendica | 2012-04-02 | 2 | -2/+33 |
| | | |_|/
| |/| | |
|
| * | | | | API: template for test function added | Michael Vogel | 2012-04-02 | 1 | -0/+1 |
| * | | | | Merge commit 'upstream/master' | Michael Vogel | 2012-04-02 | 86 | -488/+1850 |
| |\| | | |
|
| | * | | | diabook-themes: css-fixes | tommy tomson | 2012-04-02 | 24 | -20/+125 |
| | * | | | diabook-themes: fixes in js | tommy tomson | 2012-04-02 | 4 | -112/+115 |
