Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'pull' | Friendika | 2011-10-05 | 1 | -1/+1 |
|\ | |||||
| * | Merge pull request #19 from tobiasd/master | Friendika | 2011-10-05 | 1 | -1/+1 |
| |\ | | | | | | | link Diaspora* to the foundation homepage | ||||
| | * | point Diaspora* to the foundation homepage instead of joindiaspora.com | Tobias Diekershoff | 2011-10-05 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'master' of git://github.com/friendika/Free-Friendika | Tobias Diekershoff | 2011-10-05 | 85 | -2961/+1745 |
| | |\ | |||||
| | * \ | Merge branch 'master' of git://github.com/friendika/Free-Friendika | Tobias Diekershoff | 2011-09-29 | 0 | -0/+0 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' of git://github.com/friendika/Free-Friendika | Tobias Diekershoff | 2011-09-29 | 26 | -462/+134 |
| | |\ \ \ | |||||
* | | | | | | clean up w3c validation and layout for priv mail and lang selector | Friendika | 2011-10-05 | 8 | -11/+17 |
|/ / / / / | |||||
* | | | | | Merge branch 'pull' | Friendika | 2011-10-05 | 2 | -33/+123 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Merge pull request #18 from duthied/master | duthied | 2011-10-05 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | | | tweak to notification drop-down line items in testbubble theme | ||||
| | * | | | | wrapped notification line item with the anchros tag instead of the inner, ↵ | Devlon Duthie | 2011-10-05 | 1 | -1/+1 |
| |/ / / / | | | | | | | | | | | | | | | | makes the whole line item a link (better) | ||||
| * | | | | Merge pull request #17 from duthied/master | duthied | 2011-10-05 | 2 | -33/+123 |
| |\ \ \ \ | | | | | | | | | | | | | drop-down notification menu support added to testbubble theme | ||||
| | * | | | | - added drop-down notification support in testbubble theme | Devlon Duthie | 2011-10-05 | 2 | -33/+123 |
| | | | | | | |||||
* | | | | | | better check for orig post author | Friendika | 2011-10-05 | 2 | -2/+2 |
|/ / / / / | |||||
* | | | | | added prepare_body hooks | Friendika | 2011-10-05 | 1 | -0/+6 |
| | | | | | |||||
* | | | | | document backward compat issue | Friendika | 2011-10-04 | 1 | -0/+4 |
| | | | | | |||||
* | | | | | yikes | Friendika | 2011-10-04 | 2 | -2/+2 |
| | | | | | |||||
* | | | | | another typo | Friendika | 2011-10-04 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | and a typo fix | Friendika | 2011-10-04 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | notification issue after last checkin | Friendika | 2011-10-04 | 1 | -1/+9 |
| | | | | | |||||
* | | | | | performance enhancements | Friendika | 2011-10-04 | 5 | -8/+22 |
|/ / / / | |||||
* | | | | Merge pull request #16 from duthied/master | duthied | 2011-10-04 | 3 | -10/+30 |
|\ \ \ \ | | | | | | | | | | | Minor ui tweaks | ||||
| * | | | | - moved the header for profile permissions out of the scrolling div | Devlon Duthie | 2011-10-04 | 3 | -10/+30 |
| | | | | | | | | | | | | | | | | | | | | - tweaks to the testbubble theme's nav | ||||
* | | | | | urlescape saved search terms | Friendika | 2011-10-04 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | document multi-pass mode on consume_feed | Friendika | 2011-10-04 | 1 | -0/+11 |
| | | | | | |||||
* | | | | | Merge branch 'pull' | Friendika | 2011-10-04 | 2 | -392/+969 |
|\ \ \ \ \ | |||||
| * | | | | | Updated french locale. | Olivier Migeot | 2011-10-04 | 2 | -394/+971 |
| | | | | | | |||||
| * | | | | | Merge remote branch 'upstream/master' | Olivier Migeot | 2011-10-04 | 467 | -15528/+23770 |
| |\ \ \ \ \ | |||||
| * | | | | | | Small fix | Olivier Migeot | 2011-08-24 | 2 | -2/+2 |
| | | | | | | | |||||
* | | | | | | | improve feed import performance | Friendika | 2011-10-04 | 3 | -13/+13 |
| | | | | | | | |||||
* | | | | | | | lrdd attributes for zot changed | Friendika | 2011-10-04 | 1 | -7/+5 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | 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 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | some work on quattro theme and a little fix to JS | ||||
| * | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | / / / / | | |_|_|/ / / / | |/| | | | | | | templated 'find similar' content + extended match content in testbubble theme | ||||
| * | | | | | | | broke 'find similar' matches content into a tpl in core, added an extended ↵ | Devlon Duthie | 2011-10-03 | 4 | -54/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tpl to testbubble that lists the profile tags | ||||
* | | | | | | | | Merge branch 'pull' | Friendika | 2011-10-02 | 3 | -14/+25 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Merge pull request #13 from duthied/master | duthied | 2011-10-02 | 3 | -14/+25 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | message tab styling - to set as active depending on url | ||||
| | * | | | | | | | added activetab var to message.php for templates | Devlon Duthie | 2011-10-02 | 3 | -14/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (testbubble only) added logic to photo header to make tab 'sticky' (active class for styling) (testbubble only) css fix for avatars in wallitems | ||||
| | * | | | | | | | 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 |
| |\| | | | | | | | | | |/ / / / / / / | |/| | | | | | | | testbubble photo album image tweaks |