aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'pull'friendica2011-11-293-3/+24
|\
| * Merge pull request #10 from fabrixxm/masterfabrixxm2011-11-293-3/+24
| |\ | | | | | | small quattro things
| | * quattro: "manage" menu item in site menuFabio Comuni2011-11-291-1/+3
| | |
| | * quattro: default user image in itemFabio Comuni2011-11-292-2/+21
| |/
* | begininning d* conversation modefriendica2011-11-291-5/+39
| |
* | private notes in testbubblefriendica2011-11-291-1/+1
|/
* use default post permissions when coming from api - unless permissions are ↵friendica2011-11-281-0/+11
| | | | explicitly set.
* mysql error report fix (no mysqli), suggested friends for new members settingsfriendica2011-11-285-12/+88
|
* poco addition to provide a "suggestme" for new membersfriendica2011-11-283-22/+55
|
* start of d* private mail, dba without mysqlifriendica2011-11-275-16/+224
|
* wrong length in image extractorfriendica2011-11-271-4/+5
|
* more readable private image extraction for bypassing preg limitsfriendica2011-11-272-9/+8
|
* extract private images before bbcode translation since preg has issues with ↵friendica2011-11-273-2/+23
| | | | large data sizes.
* start on bug #227 - more to dofriendica2011-11-254-6/+25
|
* "show more" -> move closer to textfriendica2011-11-241-1/+1
|
* remove old liveupdate markerfriendica2011-11-242-19/+0
|
* rework the liveupdate fixes - what a messfriendica2011-11-242-13/+29
|
* move liveupdate after birthdays/eventsfriendica2011-11-242-8/+28
|
* nasty stuff...friendica2011-11-241-1/+1
|
* more thread update fixesfriendica2011-11-241-9/+11
|
* fixing conversation updatesfriendica2011-11-246-19/+17
|
* comments collapsing on page updatefriendica2011-11-242-10/+10
|
* little stuff - name change, live updates, new network typesfriendica2011-11-2318-2315/+2384
|
* 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'
| | * 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
| | | | name in email templates
* Merge pull request #8 from fabrixxm/masterfabrixxm2011-11-2121-73/+619
|\ | | | | expire settings, clean html from php, more work on quattro
| * 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
| | |\ \ | | | | | | | | | | Fix possibile fatal error with oembed
| * | | | 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 ↵Fabio Comuni2011-11-2118-66/+549
| | | | | | | | | | | | | | | | widgets.