Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/friendika/friendika.git | Fabio Comuni | 2011-02-04 | 2 | -4/+23 |
|\ | |||||
| * | Merge branch 'photos' of https://github.com/fabrixxm/friendika into fabrixxm-... | Friendika | 2011-02-03 | 2 | -4/+23 |
| |\ | |||||
| | * | remove an erroneously pasted line | fabrixxm | 2011-02-03 | 1 | -6/+1 |
| | * | Fix tabs | Fabio Comuni | 2011-02-03 | 1 | -14/+14 |
| | * | Show lock info on photos | Fabio Comuni | 2011-02-03 | 1 | -1/+9 |
| | * | Extend lockview to show info on items, photos and events | Fabio Comuni | 2011-02-03 | 1 | -4/+20 |
* | | | small fix to IT strings | fabrixxm | 2011-02-04 | 1 | -1/+1 |
|/ / | |||||
* | | warn folks that changing your domain name after making friends is not support... | Friendika | 2011-02-03 | 1 | -0/+5 |
* | | found the issue - remove the extra tracing stuff | Friendika | 2011-02-03 | 1 | -7/+1 |
* | | allow parentless items from SN - add more tracing on notify failures | Friendika | 2011-02-03 | 2 | -8/+28 |
* | | allow changing album name in photo edit page | Friendika | 2011-02-03 | 9 | -13/+34 |
* | | don't parse garbage in phase2 of dfrn_deliver either | Friendika | 2011-02-03 | 1 | -0/+7 |
* | | remove self | Friendika | 2011-02-03 | 7 | -5/+79 |
* | | Merge branch 'tobiasd-master' | Friendika | 2011-02-02 | 1 | -1/+1 |
|\ \ | |||||
| * | | double $ in de/strings.php corrected | Tobias Diekershoff | 2011-02-03 | 1 | -1/+1 |
* | | | Merge branch 'tobiasd-master' | Friendika | 2011-02-02 | 1 | -7/+55 |
|\| | | |||||
| * | | updates to the German strings.php file | Tobias Diekershoff | 2011-02-03 | 1 | -7/+55 |
* | | | Merge branch 'fabrixxm-master' | Friendika | 2011-02-02 | 4 | -12/+55 |
|\ \ \ | |||||
| * | | | IT string update | fabrixxm | 2011-02-03 | 1 | -0/+19 |
| * | | | Merge branch 'friendika-master' | fabrixxm | 2011-02-03 | 9 | -30/+114 |
| |\| | | |||||
| * | | | Merge branch 'friendika-master' | fabrixxm | 2011-02-02 | 7 | -37/+84 |
| |\ \ \ | |||||
| * | | | | update jot-headers | fabrixxm | 2011-02-01 | 3 | -12/+36 |
| * | | | | Merge branch 'friendika-master' | fabrixxm | 2011-02-01 | 2 | -18/+36 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of github.com:fabrixxm/friendika | fabrixxm | 2011-02-01 | 5 | -69/+71 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Merge remote branch 'friendika-master/master' | Fabio Comuni | 2011-02-01 | 25 | -126/+341 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' of github.com:fabrixxm/friendika | Fabio Comuni | 2011-02-01 | 0 | -0/+0 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge remote branch 'friendika-master/master' | Fabio Comuni | 2011-01-31 | 29 | -135/+321 |
| | |\ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ | Merge branch 'friendika-master' | fabrixxm | 2011-02-01 | 35 | -89/+374 |
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' of github.com:fabrixxm/friendika | fabrixxm | 2011-01-29 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | * | | | | | | | Merge remote branch 'friendika-master/master' | Fabio Comuni | 2011-01-28 | 18 | -452/+666 |
| | |\ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ | Merge branch 'friendika-master' | fabrixxm | 2011-01-29 | 16 | -105/+219 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'friendika-master' | fabrixxm | 2011-01-28 | 18 | -452/+666 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | / / / / / / / | | | |/ / / / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Merge branch 'friendika-master' | fabrixxm | 2011-01-27 | 93 | -36/+7067 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'friendika-master' | fabrixxm | 2011-01-25 | 57 | -11/+2930 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | append jotplugin tools to current toolbar row | Friendika | 2011-02-02 | 6 | -18/+23 |
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
* | | | | | | | | | | | silence php notices about $manual_id not being defined | Friendika | 2011-02-02 | 1 | -5/+5 |
* | | | | | | | | | | | don't try to parse non-xml in dfrn_deliver | Friendika | 2011-02-02 | 1 | -0/+6 |
* | | | | | | | | | | | be more forgiving about the order of link parameters in html->bb | Friendika | 2011-02-02 | 1 | -2/+2 |
* | | | | | | | | | | | get media-rss thumbnail if available and nothing else was found (e.g. github). | Friendika | 2011-02-02 | 1 | -0/+6 |
* | | | | | | | | | | | string update, allow js_upload file selection text to be localised | Friendika | 2011-02-02 | 2 | -0/+33 |
* | | | | | | | | | | | suppress some scraping errors when confronted with hybrid/strange | Friendika | 2011-02-02 | 2 | -2/+21 |
* | | | | | | | | | | | backward compatibility | Friendika | 2011-02-01 | 2 | -23/+20 |
* | | | | | | | | | | | protocol reversal, roll dfrn_version to 2.1 | Friendika | 2011-02-01 | 3 | -22/+45 |
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
* | | | | | | | | | | silence a few notice warnings | Friendika | 2011-02-01 | 1 | -2/+2 |
* | | | | | | | | | | trying to solve the double encoding issue | Friendika | 2011-02-01 | 1 | -41/+22 |
* | | | | | | | | | | make sure content is unaltered | Friendika | 2011-02-01 | 1 | -15/+18 |
* | | | | | | | | | | typo | Friendika | 2011-02-01 | 1 | -1/+1 |
* | | | | | | | | | | get correct article timestamp for feeds with no 'published' and with non-utc ... | Friendika | 2011-02-01 | 1 | -3/+5 |
* | | | | | | | | | | don't try to scrape atom/rss feeds. missing param in contact store (mod_follow) | Friendika | 2011-02-01 | 3 | -1/+62 |
* | | | | | | | | | | truncate long names | Friendika | 2011-02-01 | 2 | -2/+2 |
| |_|_|_|_|_|_|_|/ |/| | | | | | | | |