aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'pull'friendica2011-11-231-1/+0
|\
| * Merge pull request #9 from felixgilles/patch-1friendica2011-11-231-1/+0
| |\
| | * Duplicate KEY 'wall' in TABLE 'item'felixgilles2011-11-231-1/+0
| |/
* / ensure comment counts update after refactor of collapsed commentsfriendica2011-11-233-2/+3
|/
* diaspora reshared lists rendering as htmlfriendica2011-11-232-1/+20
* string update es,frfriendica2011-11-224-10475/+9658
* Merge branch 'pull'friendica2011-11-222-3472/+4288
|\
| * German stringsTobias Diekershoff2011-11-222-3472/+4288
* | rework show/hide commentsfriendica2011-11-225-6/+37
|/
* add expire_starred option, fix "delete selected" on some themes, new project ...friendica2011-11-2111-12/+70
* Merge pull request #8 from fabrixxm/masterfabrixxm2011-11-2121-73/+619
|\
| * Merge remote-tracking branch 'friendica/master'Fabio Comuni2011-11-219-16/+132
| |\ | |/ |/|
* | community forums cleanupfriendica2011-11-191-2/+5
* | revupfriendica2011-11-191-1/+1
* | forum cleanupfriendica2011-11-191-5/+2
* | Merge branch 'master' into groupsfriendica2011-11-191-1/+1
|\ \
| * | don't allow space in autocomplete nicknamefriendica2011-11-181-1/+1
* | | first forum testfriendica2011-11-192-15/+26
* | | new approach to secondary delivery forkfriendica2011-11-181-15/+24
* | | Merge branch 'master' into groupsfriendica2011-11-1812-38/+89
|\| |
| * | update user-agent string for remote http requestsfriendica2011-11-181-2/+2
| * | Merge branch 'pull'friendica2011-11-182-15/+29
| |\ \
| | * \ Merge pull request #7 from fabrixxm/masterfabrixxm2011-11-172-15/+29
| | |\ \
| * | | | forum split delivery flagfriendica2011-11-184-5/+14
| * | | | comment boxes not work in alternate languagesfriendica2011-11-172-3/+7
| |/ / /
* | | | tgroup relaysfriendica2011-11-151-4/+87
| | | * more work on quattro. remove html from php for groups and saved searches widg...Fabio Comuni2011-11-2118-66/+549
| | | * log less in expire itemsFabio Comuni2011-11-171-6/+1
| | | * expire settings for items, notes and photos.Fabio Comuni2011-11-174-7/+75
| | |/
| | * Merge remote-tracking branch 'friendica/master'Fabio Comuni2011-11-178-20/+45
| | |\ | | |/ | |/|
| * | allow dup tag names with different urlsfriendica2011-11-161-6/+9
| * | check all attribute names for validityfriendica2011-11-162-4/+8
| * | Merge branch 'pull'friendica2011-11-161-2/+1
| |\ \
| | * \ Merge pull request #6 from fabrixxm/masterfabrixxm2011-11-161-2/+1
| | |\ \
| * | | | change hide profile setting textfriendica2011-11-161-1/+1
| |/ / /
| * | | updatefriendica2011-11-151-1/+10
| * | | add a few more sql indexesfriendica2011-11-153-3/+12
|/ / /
* | | Merge https://github.com/friendica/friendica into pullfriendica2011-11-1520-5654/+6850
|\ \ \
| * \ \ Merge pull request #5 from fabrixxm/masterfabrixxm2011-11-1520-5654/+6850
| |\ \ \
* | | | | revup - change connector config link in docfriendica2011-11-152-6/+6
|/ / / /
| | | * oembed: don't try to fetch media files and add Accept request header to fetch...Fabio Comuni2011-11-172-15/+29
| | |/
| | * Merge branch 'master' of github.com:fabrixxm/friendicaFabio Comuni2011-11-162-3403/+4212
| | |\ | | |/ | |/|
| * | Update IT stringsFabio Comuni2011-11-152-3403/+4212
| | * fix localize item tagFabio Comuni2011-11-161-2/+1
| |/
| * update messages.poFabio Comuni2011-11-151-2222/+2442
| * quattro: tags styleFabio Comuni2011-11-154-0/+29
| * ping: show tagsFabio Comuni2011-11-151-4/+18
| * item tags as array to templatesFabio Comuni2011-11-1511-23/+143
| * quattro: fix delete selected itemsFabio Comuni2011-11-152-2/+2
| * Merge remote-tracking branch 'friendica/master'Fabio Comuni2011-11-151-1/+1
| |\ | |/ |/|