| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-18 | 0 | -0/+0 |
* | Merge pull request #247 from simonlnu/master | Simon | 2012-04-18 | 14 | -14/+14 |
|\ |
|
| * | only affect immediate li children | Simon L'nu | 2012-04-18 | 2 | -2/+2 |
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-18 | 0 | -0/+0 |
| |\
| |/
|/| |
|
* | | Merge pull request #246 from simonlnu/master | Simon | 2012-04-18 | 4 | -76/+105 |
|\ \ |
|
| | * | fix silly abandonded typo. shouldn't affect translations | Simon L'nu | 2012-04-18 | 12 | -12/+12 |
| |/ |
|
| * | fix alignment issues with toolbar | Simon L'nu | 2012-04-18 | 4 | -76/+105 |
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-18 | 32 | -88/+8975 |
| |\
| |/
|/| |
|
* | | diabook-themes: some css/bug-fixes | tommy tomson | 2012-04-18 | 29 | -86/+441 |
* | | Merge pull request #244 from mschmitt/master | friendica | 2012-04-17 | 2 | -0/+8532 |
|\ \ |
|
| * | | messages.po/strings.php at 100% Esperanto | Martin Schmitt | 2012-04-17 | 2 | -0/+8532 |
* | | | Merge pull request #243 from CatoTH/master | friendica | 2012-04-17 | 1 | -2/+2 |
|\ \ \
| |/ /
|/| | |
|
| * | | Typo | Tobias Hößl | 2012-04-17 | 1 | -2/+2 |
|/ / |
|
| * | 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 |
|\ |
|
| * | DBA: Reverting back to original source | Michael Vogel | 2012-04-14 | 1 | -3/+1 |
| * | DBA: Nothing really done .. | Michael Vogel | 2012-04-14 | 1 | -71/+0 |
| * | Merge commit 'upstream/master' | Michael Vogel | 2012-04-14 | 98 | -911/+2464 |
| |\ |
|
| * \ | Merge commit 'upstream/master' | Michael Vogel | 2012-04-13 | 88 | -12005/+2087 |
| |\ \ |
|
| * | | | DBA: Deactivation of the mysqli-class for testing purposes. | Michael Vogel | 2012-04-13 | 1 | -30/+31 |
| * | | | Merge commit 'upstream/master' | Michael Vogel | 2012-04-11 | 133 | -1946/+2921 |
| |\ \ \ |
|
| * | | | | API: Improved the timeline. Several (disabled) tests with caching of photos. | Michael Vogel | 2012-04-11 | 4 | -8/+42 |
| * | | | | html2plain: changed behaviour for the "hr" element. | Michael Vogel | 2012-04-09 | 1 | -1/+1 |
| * | | | | API: Tweetdeck is now working | Michael Vogel | 2012-04-09 | 2 | -54/+51 |
| * | | | | API: Added Public Timeline | Michael Vogel | 2012-04-08 | 1 | -5/+85 |