Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'newui' of github.com:fabrixxm/friendika into newui | fabrixxm | 2011-09-05 | 159 | -2284/+5000 |
|\ | |||||
| * | profiles popup menu in sidebar | Fabio Comuni | 2011-09-05 | 4 | -6/+53 |
| | | |||||
| * | add *~ to gitignore | Fabio Comuni | 2011-09-05 | 1 | -0/+1 |
| | | |||||
| * | Load infos and notices via ping and show them with js popup | Fabio Comuni | 2011-09-05 | 22 | -12/+222 |
| | | |||||
| * | Add tipTip js tooltips | Fabio Comuni | 2011-09-05 | 5 | -2/+175 |
| | | |||||
| * | fix profile edit link and d* photo urls | Fabio Comuni | 2011-09-05 | 1 | -4/+4 |
| | | |||||
| * | fix aside contact block, add edit profiles icon | Fabio Comuni | 2011-09-05 | 3 | -5/+20 |
| | | |||||
| * | move js to js folder | Fabio Comuni | 2011-09-05 | 11 | -7/+9 |
| | | |||||
| * | move icons style in new file | Fabio Comuni | 2011-09-05 | 4 | -43/+146 |
| | | |||||
| * | More icons | Fabio Comuni | 2011-09-05 | 54 | -0/+14 |
| | | |||||
| * | Merge remote-tracking branch 'friendika/master' into newui | Fabio Comuni | 2011-09-05 | 46 | -1273/+2988 |
| |\ | |||||
| | * | custom attags | Friendika | 2011-09-04 | 4 | -7/+19 |
| | | | |||||
| | * | bookmarks + bug #140 | Friendika | 2011-09-04 | 9 | -9/+48 |
| | | | |||||
| | * | saved searches on network page | Friendika | 2011-09-04 | 8 | -7/+108 |
| | | | |||||
| | * | set max height of acl names to avoid wrap | Friendika | 2011-09-04 | 3 | -3/+3 |
| | | | |||||
| | * | truncate overflow text on acl selector items (3 themes) | Friendika | 2011-09-04 | 4 | -5/+5 |
| | | | |||||
| | * | scrape_url - use feed url if no name can be found | Friendika | 2011-09-04 | 3 | -6/+30 |
| | | | |||||
| | * | Merge branch 'pull' | Friendika | 2011-09-04 | 1 | -2/+2 |
| | |\ | |||||
| | | * | diaspora has no timezone - use UTC for events | Friendika | 2011-09-03 | 1 | -2/+2 |
| | | | | |||||
| | * | | add timezone convert module, several other minor or in progress fixes | Friendika | 2011-09-04 | 6 | -7/+56 |
| | |/ | |||||
| | * | format events for diaspora | Friendika | 2011-09-03 | 1 | -8/+50 |
| | | | |||||
| | * | no plink on imported D* posts | Friendika | 2011-09-03 | 1 | -0/+3 |
| | | | |||||
| | * | match bbcode multiline | Friendika | 2011-09-03 | 1 | -41/+41 |
| | | | |||||
| | * | provide option to block Facebook wall but still allow social stream | Friendika | 2011-09-03 | 1 | -12/+16 |
| | | | |||||
| | * | Merge branch 'pull' | Friendika | 2011-09-02 | 8 | -1132/+2222 |
| | |\ | |||||
| | | * | Merge pull request #169 from michal-s/master | Friendika | 2011-09-02 | 8 | -1132/+2222 |
| | | |\ | | | | | | | | | | | minor changes of czech translations | ||||
| | | | * | minor changes of czech translations | Michal Supler | 2011-09-03 | 8 | -1132/+2222 |
| | | | | | |||||
| | * | | | Merge branch 'pull' | Friendika | 2011-09-02 | 2 | -1/+5 |
| | |\| | | |||||
| | | * | | Merge pull request #168 from Erkan-Yilmaz/master | Friendika | 2011-09-02 | 2 | -1/+5 |
| | | |\ \ | | | | | | | | | | | | | typo in German page: admin > log | ||||
| | | | * | | inital info for Facebook + CC by licence | Erkan Yilmaz | 2011-09-03 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | further info here: http://groups.google.com/group/friendika/browse_thread/thread/7562e0b22f815a79 | ||||
| | | | * | | Merge remote branch 'upstream/master' | Erkan Yilmaz | 2011-09-03 | 2 | -11/+48 |
| | | | |\ \ | | | | |/ / | | | |/| | | |||||
| | | | * | | typo in German admin log page | Erkan Yilmaz | 2011-09-02 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | revup | Friendika | 2011-09-02 | 1 | -1/+1 |
| | |/ / / | |||||
| | * | | | zot: dealing with foreign messages | Friendika | 2011-09-02 | 1 | -2/+14 |
| | | | | | |||||
| | * | | | completely enclose ~f hashtags so they don't get hijacked by D* | Friendika | 2011-09-02 | 1 | -1/+2 |
| | | | | | |||||
| | * | | | protocol update, require a recipient encrypted envelope or it cannot be | Friendika | 2011-09-02 | 1 | -8/+32 |
| | |/ / | | | | | | | | | | | | | decrypted. | ||||
| | * | | Merge pull request #167 from Erkan-Yilmaz/master | Friendika | 2011-09-01 | 1 | -4/+4 |
| | |\ \ | | | | | | | | | | | typos, adapt to identi.ca situation | ||||
| | | * | | typos + adapt | Erkan Yilmaz | 2011-09-02 | 1 | -4/+4 |
| | |/ / | |||||
| | * | | Merge pull request #166 from Erkan-Yilmaz/master | fabrixxm | 2011-09-01 | 3 | -13/+13 |
| | |\ \ | | | | | | | | | | | typo in widget plugin text | ||||
| | | * | | typos in README files of plugins: impressum + statusnet | Erkan Yilmaz | 2011-09-02 | 2 | -12/+12 |
| | | | | | |||||
| | | * | | typo in widget plugin text | Erkan Yilmaz | 2011-09-02 | 1 | -1/+1 |
| | |/ / | |||||
| | * | | Merge pull request #165 from Erkan-Yilmaz/master | Friendika | 2011-09-01 | 1 | -6/+6 |
| | |\ \ | | | | | | | | | | | update twitter plugin README: typos + new menu structure | ||||
| | | * | | fix README for twitter plugin: typos + change to new menu structure | Erkan Yilmaz | 2011-09-02 | 1 | -6/+6 |
| | |/ / | |||||
| | * | | error viewing logfiles over 2Gb | Friendika | 2011-09-01 | 1 | -1/+1 |
| | | | | |||||
| | * | | infrastructure for personalised @ tags (no UI/settings form yet), allow own ↵ | Friendika | 2011-09-01 | 7 | -9/+19 |
| | | | | | | | | | | | | | | | | comments through statusnet connector | ||||
| | * | | Merge branch 'pull' | Friendika | 2011-09-01 | 3 | -4/+21 |
| | |\ \ | |||||
| | | * \ | Merge pull request #164 from fabrixxm/master | fabrixxm | 2011-09-01 | 2 | -3/+3 |
| | | |\ \ | | | | | | | | | | | | | small fix to IT strings | ||||
| | | | * | | small fix to IT strings | Fabio Comuni | 2011-09-01 | 2 | -3/+3 |
| | | |/ / | |||||
| | | * | | Add some links to external resources | fabrixxm | 2011-09-01 | 1 | -1/+18 |
| | | | | | |||||
| | * | | | login_hook | Friendika | 2011-09-01 | 3 | -6/+13 |
| | |/ / |