Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge branch 'pull' | friendica | 2011-11-22 | 2 | -3472/+4288 | |
|\ | ||||||
| * | German strings | Tobias Diekershoff | 2011-11-22 | 2 | -3472/+4288 | |
| | | ||||||
* | | rework show/hide comments | friendica | 2011-11-22 | 5 | -6/+37 | |
|/ | ||||||
* | add expire_starred option, fix "delete selected" on some themes, new project ↵ | friendica | 2011-11-21 | 11 | -12/+70 | |
| | | | | name in email templates | |||||
* | Merge pull request #8 from fabrixxm/master | fabrixxm | 2011-11-21 | 21 | -73/+619 | |
|\ | | | | | expire settings, clean html from php, more work on quattro | |||||
| * | Merge remote-tracking branch 'friendica/master' | Fabio Comuni | 2011-11-21 | 9 | -16/+132 | |
| |\ | |/ |/| | ||||||
* | | community forums cleanup | friendica | 2011-11-19 | 1 | -2/+5 | |
| | | ||||||
* | | revup | friendica | 2011-11-19 | 1 | -1/+1 | |
| | | ||||||
* | | forum cleanup | friendica | 2011-11-19 | 1 | -5/+2 | |
| | | ||||||
* | | Merge branch 'master' into groups | friendica | 2011-11-19 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | don't allow space in autocomplete nickname | friendica | 2011-11-18 | 1 | -1/+1 | |
| | | | ||||||
* | | | first forum test | friendica | 2011-11-19 | 2 | -15/+26 | |
| | | | ||||||
* | | | new approach to secondary delivery fork | friendica | 2011-11-18 | 1 | -15/+24 | |
| | | | ||||||
* | | | Merge branch 'master' into groups | friendica | 2011-11-18 | 12 | -38/+89 | |
|\| | | ||||||
| * | | update user-agent string for remote http requests | friendica | 2011-11-18 | 1 | -2/+2 | |
| | | | ||||||
| * | | Merge branch 'pull' | friendica | 2011-11-18 | 2 | -15/+29 | |
| |\ \ | ||||||
| | * \ | Merge pull request #7 from fabrixxm/master | fabrixxm | 2011-11-17 | 2 | -15/+29 | |
| | |\ \ | | | | | | | | | | | Fix possibile fatal error with oembed | |||||
| * | | | | forum split delivery flag | friendica | 2011-11-18 | 4 | -5/+14 | |
| | | | | | ||||||
| * | | | | comment boxes not work in alternate languages | friendica | 2011-11-17 | 2 | -3/+7 | |
| |/ / / | ||||||
* | | | | tgroup relays | friendica | 2011-11-15 | 1 | -4/+87 | |
| | | | | ||||||
| | | * | more work on quattro. remove html from php for groups and saved searches ↵ | Fabio Comuni | 2011-11-21 | 18 | -66/+549 | |
| | | | | | | | | | | | | | | | | widgets. | |||||
| | | * | log less in expire items | Fabio Comuni | 2011-11-17 | 1 | -6/+1 | |
| | | | | ||||||
| | | * | expire settings for items, notes and photos. | Fabio Comuni | 2011-11-17 | 4 | -7/+75 | |
| | |/ | | | | | | | | | | show default privacy acl in popup | |||||
| | * | Merge remote-tracking branch 'friendica/master' | Fabio Comuni | 2011-11-17 | 8 | -20/+45 | |
| | |\ | | |/ | |/| | ||||||
| * | | allow dup tag names with different urls | friendica | 2011-11-16 | 1 | -6/+9 | |
| | | | ||||||
| * | | check all attribute names for validity | friendica | 2011-11-16 | 2 | -4/+8 | |
| | | | ||||||
| * | | Merge branch 'pull' | friendica | 2011-11-16 | 1 | -2/+1 | |
| |\ \ | ||||||
| | * \ | Merge pull request #6 from fabrixxm/master | fabrixxm | 2011-11-16 | 1 | -2/+1 | |
| | |\ \ | | | | | | | | | | | small fix | |||||
| * | | | | change hide profile setting text | friendica | 2011-11-16 | 1 | -1/+1 | |
| |/ / / | ||||||
| * | | | update | friendica | 2011-11-15 | 1 | -1/+10 | |
| | | | | ||||||
| * | | | add a few more sql indexes | friendica | 2011-11-15 | 3 | -3/+12 | |
|/ / / | ||||||
* | | | Merge https://github.com/friendica/friendica into pull | friendica | 2011-11-15 | 20 | -5654/+6850 | |
|\ \ \ | ||||||
| * \ \ | Merge pull request #5 from fabrixxm/master | fabrixxm | 2011-11-15 | 20 | -5654/+6850 | |
| |\ \ \ | | | | | | | | | | | themes and strings works | |||||
* | | | | | revup - change connector config link in doc | friendica | 2011-11-15 | 2 | -6/+6 | |
|/ / / / | ||||||
| | | * | oembed: don't try to fetch media files and add Accept request header to ↵ | Fabio Comuni | 2011-11-17 | 2 | -15/+29 | |
| | |/ | | | | | | | | | | fetch_url | |||||
| | * | Merge branch 'master' of github.com:fabrixxm/friendica | Fabio Comuni | 2011-11-16 | 2 | -3403/+4212 | |
| | |\ | | |/ | |/| | ||||||
| * | | Update IT strings | Fabio Comuni | 2011-11-15 | 2 | -3403/+4212 | |
| | | | ||||||
| | * | fix localize item tag | Fabio Comuni | 2011-11-16 | 1 | -2/+1 | |
| |/ | ||||||
| * | update messages.po | Fabio Comuni | 2011-11-15 | 1 | -2222/+2442 | |
| | | ||||||
| * | quattro: tags style | Fabio Comuni | 2011-11-15 | 4 | -0/+29 | |
| | | ||||||
| * | ping: show tags | Fabio Comuni | 2011-11-15 | 1 | -4/+18 | |
| | | ||||||
| * | item tags as array to templates | Fabio Comuni | 2011-11-15 | 11 | -23/+143 | |
| | | ||||||
| * | quattro: fix delete selected items | Fabio Comuni | 2011-11-15 | 2 | -2/+2 | |
| | | ||||||
| * | Merge remote-tracking branch 'friendica/master' | Fabio Comuni | 2011-11-15 | 1 | -1/+1 | |
| |\ | |/ |/| | ||||||
* | | revup | friendica | 2011-11-14 | 1 | -1/+1 | |
| | | ||||||
| * | duepuntozero: fix input width in aside | Fabio Comuni | 2011-11-15 | 1 | -0/+4 | |
|/ | ||||||
* | Merge pull request #4 from fabrixxm/master | fabrixxm | 2011-11-14 | 1 | -6/+6 | |
|\ | | | | | ping: fix total count and comment/post | |||||
| * | ping: fix total count and comment/post | Fabio Comuni | 2011-11-14 | 1 | -6/+6 | |
| | | ||||||
* | | D* doesn't like html entities in post. Convert our hijack-proof hashtag ↵ | friendica | 2011-11-13 | 1 | -1/+1 | |
| | | | | | | | | replacement to utf-8 | |||||
* | | translate vimeo and youtube bbcode to naked links so D* will oembed them again | friendica | 2011-11-13 | 1 | -11/+9 | |
| | |