| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| ... | |
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-17 | 0 | -0/+0 |
| | | |/ |
|
| | | * | diabook-themes: theme-settings: "wide"-option and new screenshots | tommy tomson | 2012-04-17 | 28 | -32/+25069 |
| | | * | Merge pull request #242 from simonlnu/master | Simon | 2012-04-17 | 2 | -10/+0 |
| | | |\ |
|
| | | | * | [SECURITY] finish ripping out fpostit | Simon L'nu | 2012-04-17 | 2 | -10/+0 |
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-17 | 0 | -0/+0 |
| | | |/ |
|
| | | * | Merge pull request #241 from simonlnu/master | Simon | 2012-04-17 | 12 | -328/+0 |
| | | |\ |
|
| | | | * | rip out fpostit | Simon L'nu | 2012-04-17 | 12 | -328/+0 |
| | | * | | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-04-17 | 49 | -2358/+1783 |
| | | |\ \ |
|
| | | | * | | diabook-themes: removed fpostit due to security issues and small fix in germa... | tommy tomson | 2012-04-17 | 33 | -754/+39 |
| | | | * | | Merge pull request #240 from CatoTH/master | friendica | 2012-04-17 | 9 | -43/+44 |
| | | | |\ \ |
|
| | | | | * | | Some Bugfixes, and variable checks | Tobias Hößl | 2012-04-17 | 9 | -43/+44 |
| | | | * | | | naked br appearing when attaching and textplain | friendica | 2012-04-17 | 1 | -1/+6 |
| | | | |/ / |
|
| | | | * | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-16 | 49 | -1561/+2162 |
| | | | |\ \ |
|
| | | | | * | | Merge pull request #239 from simonlnu/master | Simon | 2012-04-16 | 3 | -1463/+1572 |
| | | | | |\| |
|
| | | | | | * | finally fix the ui in the settings. it was fugly.... other bug fixes too | Simon L'nu | 2012-04-17 | 3 | -1463/+1572 |
| | | | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-16 | 0 | -0/+0 |
| | | | | |/ |
|
| | | | * | | rev update | friendica | 2012-04-16 | 3 | -97/+122 |
| | | * | | | update to the German string files | Tobias Diekershoff | 2012-04-17 | 2 | -942/+1280 |
| | | | |/
| | |/| |
|
| | | * | | diabook-themes: bugfix (sry, necessary) | tommy tomson | 2012-04-16 | 12 | -12/+52 |
| | | * | | diabook-themes: small bug/css-fixes ---> ver. 1.019 | tommy tomson | 2012-04-16 | 26 | -21/+419 |
| | | * | | diabook-themes: bug-fixes | tommy tomson | 2012-04-16 | 12 | -48/+68 |
| | | * | | diabook-themes: minor bugfixes | tommy tomson | 2012-04-16 | 12 | -25/+59 |
| | | |/ |
|
| | | * | turn on comment edit | friendica | 2012-04-16 | 1 | -4/+4 |
| | | * | propagate edited comments | friendica | 2012-04-16 | 1 | -2/+6 |
| | | * | edited comments weren't being relayed | friendica | 2012-04-16 | 1 | -0/+24 |
| | | * | rev update | friendica | 2012-04-15 | 2 | -73/+78 |
| | | * | Merge pull request #238 from annando/master | friendica | 2012-04-15 | 7 | -67/+259 |
| | | |\ |
|
| | | * | | diabook-themes: css-fixes | tommy tomson | 2012-04-15 | 17 | -24/+88 |
| | * | | | Merge commit 'upstream/master' | Michael Vogel | 2012-04-15 | 162 | -136/+8652 |
| | |\| |
| | |/
| |/| |
|
| | | * | open contact edit in same window | friendica | 2012-04-15 | 1 | -1/+1 |
| | | * | where did this "lang" string come from and why? | friendica | 2012-04-15 | 1 | -0/+10 |
| | | * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-15 | 153 | -112/+8559 |
| | | |\ |
|
| | | | * | Merge pull request #237 from simonlnu/master | Simon | 2012-04-15 | 15 | -82/+159 |
| | | | |\ |
|
| | | | | * | REALLY fix fpostit this time | Simon L'nu | 2012-04-15 | 15 | -82/+159 |
| | | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-15 | 0 | -0/+0 |
| | | | |/ |
|
| | | | * | Merge pull request #236 from simonlnu/master | Simon | 2012-04-14 | 6 | -8/+8 |
| | | | |\ |
|
| | | | | * | fix fpostJS, add and fix some other stuff | Simon L'nu | 2012-04-15 | 6 | -8/+8 |
| | | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-15 | 0 | -0/+0 |
| | | | |/ |
|
| | | | * | diabook-themes: added js for auto-growing comment-textareas | tommy tomson | 2012-04-15 | 12 | -4/+238 |
| | | | * | diabook: theme-settings: add a wide-option | tommy tomson | 2012-04-15 | 43 | -11/+8147 |
| | | | * | Merge pull request #234 from copyninja/master | friendica | 2012-04-14 | 153 | -0/+0 |
| | | | |\ |
|
| | | | | * | Another bunch of executable permission removal | Vasudev Kamath | 2012-04-14 | 121 | -0/+0 |
| | | | | * | Removed execution permission: lintian warning in Debian packaging | Vasudev Kamath | 2012-04-14 | 32 | -0/+0 |
| | | | * | | Merge pull request #235 from simonlnu/master | Simon | 2012-04-14 | 6 | -7/+7 |
| | | | |\ \ |
|
| | | | | * | | string fix: typo. slow down scroll to top in dispys | Simon L'nu | 2012-04-14 | 6 | -7/+7 |
| | | | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-14 | 7 | -8/+24 |
| | | | | |\ \
| | | | |/ /
| | | |/| | |
|
| | | | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-14 | 0 | -0/+0 |
| | | | | |/ |
|
| | | * | | | function name typo | friendica | 2012-04-15 | 1 | -1/+1 |
| | | * | | | track requested profile error msg | friendica | 2012-04-14 | 3 | -17/+62 |
| | | |/ / |
|
| | | * | | bogus empty list element in dfrn_request page when emailnet not enabled | friendica | 2012-04-14 | 2 | -2/+2 |
