Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| * | | | | fewer "bob smith to bob smith via wall-to-wall". | friendica | 2012-06-02 | 6 | -21/+36 |
| * | | | | Merge pull request #321 from beardy-unixer/master | friendica | 2012-06-01 | 1 | -1/+1 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | [quote=somebody] was appearing as an extended spoiler tag. | Thomas Willingham | 2012-06-01 | 1 | -1/+1 |
* | | | | | Merge remote branch 'upstream/master' | zottel | 2012-06-02 | 6 | -176/+186 |
|\| | | | | |||||
| * | | | | registration issue after re-factor | friendica | 2012-06-01 | 4 | -164/+167 |
| |/ / / | |||||
| * | | | Merge pull request #320 from fabrixxm/master | friendica | 2012-06-01 | 2 | -12/+19 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | install: fix bug #436 and small typo | root | 2012-06-01 | 1 | -11/+18 |
| | * | | Merge remote branch 'friendica/master' | root | 2012-06-01 | 55 | -1416/+1667 |
| | |\ \ | | |/ / | |/| | | |||||
| | * | | admin: remove update link in admin menu | root | 2012-05-25 | 1 | -1/+1 |
* | | | | Merge remote branch 'upstream/master' | zottel | 2012-06-01 | 5 | -436/+502 |
|\| | | | |||||
| * | | | turn registration code into a standalone function for re-use | friendica | 2012-05-31 | 5 | -436/+494 |
| * | | | Merge pull request #319 from fermionic/fix-diaspora-parent-query | friendica | 2012-05-31 | 1 | -2/+10 |
| |\ \ \ | |||||
| | * | | | query using both `id` and `parent` | Zach Prezkuta | 2012-05-31 | 1 | -2/+10 |
| |/ / / | |||||
* | | | | Merge remote branch 'upstream/master' | zottel | 2012-05-31 | 11 | -186/+214 |
|\| | | | |||||
| * | | | prevent email from leaking in feeds | friendica | 2012-05-30 | 1 | -0/+4 |
| * | | | y didn't i think of this b4? | friendica | 2012-05-30 | 1 | -0/+4 |