Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #326 from zzottel/master | zzottel | 2012-06-06 | 2 | -54/+48 |
|\ | |||||
| * | A few corrections in German translations. | zottel | 2012-06-07 | 2 | -54/+48 |
| * | Merge remote branch 'upstream/master' | zottel | 2012-06-07 | 3 | -123/+339 |
| |\ | |/ |/| | |||||
* | | rev update | friendica | 2012-06-06 | 3 | -123/+339 |
| * | Merge remote branch 'upstream/master' | zottel | 2012-06-06 | 13 | -453/+508 |
| |\ | |/ |/| | |||||
* | | set minchars to 2 for PM lookups too | friendica | 2012-06-05 | 1 | -0/+1 |
* | | set minchars to 2 for contacts search | friendica | 2012-06-05 | 1 | -0/+1 |
* | | contacts search autocomplete | friendica | 2012-06-05 | 2 | -2/+43 |
* | | add email probe logging, limit typo check to main addon files and skip additi... | friendica | 2012-06-05 | 2 | -3/+5 |
* | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-05 | 12 | -454/+852 |
|\ \ | |||||
| * \ | Merge pull request #325 from annando/master | friendica | 2012-06-05 | 1 | -8/+10 |
| |\ \ | |||||
| | * \ | Merge remote branch 'upstream/master' | Michael Vogel | 2012-06-04 | 62 | -2383/+3290 |
| | |\ \ | |||||
| | * | | | API: Only repeat items if there is a content | Michael Vogel | 2012-06-04 | 1 | -8/+10 |
| * | | | | DE: update for the strings | Tobias Diekershoff | 2012-06-05 | 2 | -398/+408 |
* | | | | | rev update | friendica | 2012-06-05 | 2 | -42/+37 |
* | | | | | named anchors on display page | friendica | 2012-06-04 | 3 | -0/+3 |
| | | | * | Merge remote branch 'upstream/master' | zottel | 2012-06-05 | 30 | -1287/+2256 |
| | | | |\ | | |_|_|/ | |/| | | | |||||
| * | | | | quattro: added editor buttons to comments | Tobias Diekershoff | 2012-06-04 | 5 | -6/+380 |
| | |/ / | |/| | | |||||
| * | | | quattro: cleanup the less file | Tobias Diekershoff | 2012-06-04 | 3 | -38/+50 |
| * | | | Merge pull request #324 from simonlnu/master | Simon | 2012-06-03 | 4 | -6/+6 |
|/| | | | |||||
| * | | | fix mini photo-menu bug | Simon L'nu | 2012-06-03 | 4 | -6/+6 |
| * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-06-03 | 24 | -1275/+1858 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-03 | 23 | -990/+1565 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #323 from fermionic/add-relayable-retraction-support-for-d... | friendica | 2012-06-03 | 12 | -77/+371 |
| |\ \ \ \ | |||||
| | * | | | | database updates | Zach Prezkuta | 2012-06-03 | 3 | -8/+7 |
| | * | | | | Debugged implementation of Diaspora relayable_retractions | Zach Prezkuta | 2012-06-03 | 3 | -28/+38 |
| | * | | | | cleanup and logging | Zach Prezkuta | 2012-06-03 | 1 | -22/+20 |
| | * | | | | first shot at getting like/unlike functions to work consistently | Zach Prezkuta | 2012-06-03 | 5 | -22/+142 |
| | * | | | | Fix bugs in the retraction code | Zach Prezkuta | 2012-06-03 | 7 | -65/+41 |
| | * | | | | prepare to implement database update | Zach Prezkuta | 2012-06-03 | 1 | -1/+11 |
| | * | | | | Implement relaying of relayable_retractions | Zach Prezkuta | 2012-06-03 | 8 | -43/+194 |
| | * | | | | Support relayable_retractions that are relayed to us by the top-level post owner | Zach Prezkuta | 2012-06-03 | 3 | -9/+39 |
| |/ / / / | |||||
| * | | | | 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 | 2 | -2/+3 |
* | | | | | rev update | friendica | 2012-06-03 | 2 | -285/+293 |
|/ / / / | |||||
| * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-06-03 | 22 | -459/+607 |
| |\ \ \ | |/ / / |/| | | | |||||
| * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-06-01 | 6 | -176/+186 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-31 | 24 | -717/+856 |
| |\ \ \ \ | |||||
| * | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-29 | 0 | -0/+0 |
| | | | | * | Merge remote branch 'upstream/master' | zottel | 2012-06-03 | 22 | -459/+607 |
| | | | | |\ | |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | zrl's when visiting public photos at the source site | friendica | 2012-06-03 | 1 | -0/+6 |
* | | | | | | doco | friendica | 2012-06-02 | 1 | -0/+12 |
* | | | | | | cleanup | friendica | 2012-06-02 | 1 | -1/+3 |
* | | | | | | turn "follow" into a function | friendica | 2012-06-02 | 2 | -217/+236 |
* | | | | | | add hometown to profiles | friendica | 2012-06-02 | 8 | -4/+34 |
* | | | | | | bug #439 - remove web port number from notification email "from" address | friendica | 2012-06-02 | 1 | -0/+3 |
* | | | | | | webfinger profile linker | friendica | 2012-06-02 | 5 | -213/+246 |
* | | | | | | "howlong" added to marital status. | friendica | 2012-06-02 | 8 | -5/+33 |