Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-14 | 1 | -1/+4 | |
| |\ | ||||||
| | * | quattro theme: show uncollapsed comments on display page | fabrixxm | 2012-06-14 | 1 | -1/+4 | |
| * | | better handling of dead contacts | friendica | 2012-06-14 | 1 | -0/+3 | |
| |/ | ||||||
| * | ajax append placeholder, fix some html warnings | friendica | 2012-06-13 | 8 | -3/+13 | |
| * | archive widget | friendica | 2012-06-12 | 5 | -1/+28 | |
* | | Merge branch 'master' of git://github.com/friendica/friendica | Vasudev Kamath | 2012-06-11 | 11 | -460/+485 | |
|\| | ||||||
| * | minor template update | Simon L'nu | 2012-06-09 | 2 | -7/+10 | |
| * | better events-reminder theming | friendica | 2012-06-07 | 2 | -4/+13 | |
| * | fix a random profile error message | fabrixxm | 2012-06-07 | 1 | -1/+1 | |
| * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-06 | 2 | -54/+48 | |
| |\ | ||||||
| | * | A few corrections in German translations. | zottel | 2012-06-07 | 2 | -54/+48 | |
| * | | admin page untranslated strings, remove empty list element for update | friendica | 2012-06-06 | 1 | -3/+5 | |
| |/ | ||||||
| * | rev update | friendica | 2012-06-06 | 1 | -0/+4 | |
| * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-05 | 11 | -446/+842 | |
| |\ | ||||||
| | * | DE: update for the strings | Tobias Diekershoff | 2012-06-05 | 2 | -398/+408 | |
| * | | named anchors on display page | friendica | 2012-06-04 | 3 | -0/+3 | |
* | | | Merge branch 'master' of git://github.com/friendica/friendica | Vasudev Kamath | 2012-06-04 | 5 | -6/+380 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | quattro: added editor buttons to comments | Tobias Diekershoff | 2012-06-04 | 5 | -6/+380 | |
* | | | Merge branch 'master' of git://github.com/friendica/friendica | Vasudev Kamath | 2012-06-04 | 70 | -2656/+3911 | |
|\| | | ||||||
| * | | quattro: cleanup the less file | Tobias Diekershoff | 2012-06-04 | 3 | -38/+50 | |
| * | | fix mini photo-menu bug | Simon L'nu | 2012-06-03 | 4 | -6/+6 | |
| |/ | ||||||
| * | Fix bugs in the retraction code | Zach Prezkuta | 2012-06-03 | 2 | -3/+3 | |
| * | Implement relaying of relayable_retractions | Zach Prezkuta | 2012-06-03 | 2 | -0/+21 | |
| * | quattro: admin panel styling and 1st buttons for addon/theme overview | Tobias Diekershoff | 2012-06-03 | 6 | -65/+281 | |
| * | privacy settings: make submit button translateable | Tobias Diekershoff | 2012-06-03 | 1 | -1/+1 | |
| * | DE: update to the strings | Tobias Diekershoff | 2012-06-03 | 2 | -845/+909 | |
| * | prv messages: make submit translateable | Tobias Diekershoff | 2012-06-03 | 1 | -1/+1 | |
| * | add hometown to profiles | friendica | 2012-06-02 | 3 | -2/+17 | |
| * | "howlong" added to marital status. | friendica | 2012-06-02 | 2 | -1/+4 | |
| * | some zero theming on settings page | friendica | 2012-05-30 | 3 | -5/+18 | |
| * | transition to beta for private forums | friendica | 2012-05-30 | 1 | -2/+0 | |
| * | private group tests, cont. | friendica | 2012-05-29 | 1 | -0/+1 | |
| * | hide private group if desired | friendica | 2012-05-29 | 1 | -0/+4 | |
| * | Merge pull request #316 from annando/master | Simon | 2012-05-29 | 1 | -0/+5 | |
| |\ | ||||||
| | * | Merge remote branch 'upstream/master' | Michael Vogel | 2012-05-29 | 15 | -300/+205 | |
| | |\ | ||||||
| | * \ | Merge remote branch 'upstream/master' | Michael Vogel | 2012-05-25 | 33 | -1173/+1697 | |
| | |\ \ | ||||||
| | * | | | Performance tests | Michael Vogel | 2012-05-20 | 1 | -0/+5 | |
| * | | | | fix toolbar. more size dynamicism | Simon L'nu | 2012-05-29 | 5 | -28/+38 | |
| | |_|/ | |/| | | ||||||
| * | | | ability to only expire contacts, not self | friendica | 2012-05-29 | 1 | -0/+1 | |
| * | | | more theme cleanup | friendica | 2012-05-28 | 3 | -2/+23 | |
| * | | | fixed font-size/line-height stuffs | Simon L'nu | 2012-05-28 | 11 | -294/+172 | |
| * | | | slackr - tone down the shadows a smidgin | friendica | 2012-05-27 | 1 | -4/+9 | |
| | |/ | |/| | ||||||
| * | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-25 | 9 | -442/+446 | |
| |\ \ | ||||||
| | * | | DE update to strings and templates | Tobias Diekershoff | 2012-05-25 | 3 | -397/+419 | |
| | * | | Merge pull request #313 from fabrixxm/master | Simon | 2012-05-24 | 2 | -3/+3 | |
| | |\ \ | ||||||
| | | * | | fix small js error when user not logged in | root | 2012-05-24 | 1 | -1/+1 | |
| | | * | | install wizard: fix php executable path | root | 2012-05-24 | 1 | -2/+2 | |
| | * | | | update dark a bit. i messed up some buttons | Simon L'nu | 2012-05-24 | 4 | -42/+24 | |
| * | | | | rev update | friendica | 2012-05-25 | 1 | -1/+1 | |
| |/ / / | ||||||
| * | | | slackr: improve interactivity | friendica | 2012-05-23 | 1 | -0/+14 |