Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'upstream/master' | Olivier Migeot | 2011-10-04 | 467 | -15528/+23770 |
|\ | |||||
| * | tagmatch available to anon, add paging variable to query | Friendika | 2011-10-03 | 2 | -11/+9 |
| * | item_store: prevent storing a duplicate item with same uri+uid | Friendika | 2011-10-03 | 1 | -0/+8 |
| * | Merge pull request #15 from fabrixxm/master | Friendika | 2011-10-03 | 8 | -89/+107 |
| |\ | |||||
| | * | move call to ping before call to update_* | Fabio Comuni | 2011-10-03 | 1 | -8/+9 |
| | * | fix typo | Fabio Comuni | 2011-10-03 | 2 | -13/+14 |
| | * | quattro: add comment box | Fabio Comuni | 2011-10-03 | 5 | -67/+83 |
| | * | Merge remote-tracking branch 'friendika/master' | Fabio Comuni | 2011-10-03 | 54 | -2355/+331 |
| | |\ | |||||
| | * \ | Merge remote-tracking branch 'friendika/master' | Fabio Comuni | 2011-09-30 | 88 | -693/+2651 |
| | |\ \ | |||||
| | * | | | fix star icon viewing profile page as unlogged user | Fabio Comuni | 2011-09-30 | 1 | -1/+1 |
| * | | | | add tagmatch | Friendika | 2011-10-03 | 1 | -0/+54 |
| * | | | | removing another potential way a post could have a zero parent. | Friendika | 2011-10-03 | 1 | -0/+5 |
| * | | | | ?f did not have = after it | Friendika | 2011-10-03 | 1 | -1/+1 |
| * | | | | Merge pull request #14 from duthied/master | duthied | 2011-10-02 | 4 | -54/+48 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | broke 'find similar' matches content into a tpl in core, added an extended tp... | Devlon Duthie | 2011-10-03 | 4 | -54/+48 |
| * | | | | Merge branch 'pull' | Friendika | 2011-10-02 | 3 | -14/+25 |
| |\ \ \ \ | |||||
| | * | | | | Merge pull request #13 from duthied/master | duthied | 2011-10-02 | 3 | -14/+25 |
| | |\| | | | |||||
| | | * | | | added activetab var to message.php for templates | Devlon Duthie | 2011-10-02 | 3 | -14/+25 |
| | | * | | | Merge branch 'master' of http://github.com/friendika/Free-Friendika | Devlon Duthie | 2011-10-02 | 47 | -2292/+188 |
| | | |\ \ \ | |||||
| * | | | | | | Merge branch 'pull' | Friendika | 2011-10-02 | 3 | -26/+54 |
| |\| | | | | | |||||
| | * | | | | | Merge pull request #12 from duthied/master | duthied | 2011-10-02 | 3 | -26/+54 |
| | |\| | | | | | | |/ / / | | |/| | | | |||||
| | | * | | | aspect ratio fixes for photos in testbubble theme | Devlon Duthie | 2011-10-02 | 3 | -26/+54 |
| * | | | | | basic support for AS friend requests | Friendika | 2011-10-02 | 2 | -10/+38 |
| |/ / / / | |||||
| * | | | | attack of the zombie orphans | Friendika | 2011-10-02 | 2 | -0/+5 |
| * | | | | fix notifications duepuntozero | Friendika | 2011-10-02 | 2 | -1/+11 |
| * | | | | malformed xml in ping | Friendika | 2011-10-02 | 1 | -1/+1 |
| * | | | | Merge pull request #11 from duthied/master | Friendika | 2011-10-01 | 2 | -14/+25 |
| |\| | | | |||||
| | * | | | class and wrapper div added to photo for aspect ratio display | Devlon Duthie | 2011-10-01 | 2 | -14/+25 |
| * | | | | db updates for server batch key caching, group visibility | Friendika | 2011-10-01 | 3 | -2/+25 |
| * | | | | zot protocol update | Friendika | 2011-10-01 | 2 | -33/+93 |
| * | | | | option to not post photos to status stream | Friendika | 2011-10-01 | 3 | -8/+16 |
| * | | | | darkbubble - event legibility | Friendika | 2011-10-01 | 1 | -3/+7 |
| * | | | | legibility improvements to darkbubble, mark as a derived theme | Friendika | 2011-10-01 | 34 | -2248/+26 |
| * | | | | override pragma | Friendika | 2011-10-01 | 2 | -0/+8 |
| |/ / / | |||||
| * | | | typo last checkin | Friendika | 2011-09-30 | 1 | -1/+1 |
| * | | | restore photo cache | Friendika | 2011-09-30 | 2 | -1/+3 |
| | |/ | |/| | |||||
| * | | Merge pull request #10 from duthied/master | Friendika | 2011-09-30 | 9 | -84/+55 |
| |\ \ | |||||
| | * | | 1. added button class to tpl files | Devlon Duthie | 2011-09-30 | 9 | -84/+55 |
| |/ / | |||||
| * | | possible sql errors | Friendika | 2011-09-29 | 2 | -2/+2 |
| * | | do not poll for abandoned accounts | Friendika | 2011-09-29 | 6 | -4/+26 |
| * | | add display_item hook to 'search|new' message display | Friendika | 2011-09-29 | 1 | -1/+6 |
| * | | Merge branch 'pull' | Friendika | 2011-09-29 | 2 | -117/+120 |
| |\ \ | |||||
| | * \ | Merge pull request #9 from tobiasd/6cf5da1e4bc43d8446f5789bc93f82673ec64c2e | tobiasd | 2011-09-29 | 2 | -117/+120 |
| | |\ \ | |||||
| | | * | | update to the German strings | Tobias Diekershoff | 2011-09-29 | 2 | -117/+120 |
| * | | | | added back for photos page until we can get rid of it cleanly | Friendika | 2011-09-29 | 2 | -1/+6 |
| |/ / / | |||||
| * | | | reverting wall_item.tpl | Friendika | 2011-09-28 | 1 | -41/+60 |
| * | | | Merge pull request #8 from duthied/master | Friendika | 2011-09-28 | 27 | -522/+175 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | classes added to core + testbubble theme | Devlon Duthie | 2011-09-29 | 27 | -522/+175 |
| |/ / | |||||
| * | | fix nav-selected duepuntozero | Friendika | 2011-09-28 | 3 | -9/+9 |
| * | | path for country.js - now in js directory | Friendika | 2011-09-28 | 1 | -1/+1 |