aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* refactor updatesfriendica2011-12-123-55/+80
* Merge branch 'pull'friendica2011-12-124-157/+223
|\
| * Merge pull request #18 from zzottel/masterzzottel2011-12-124-157/+223
| |\
| | * Switch to jquery 1.7.1zottel2011-12-124-157/+223
| |/
* | revupfriendica2011-12-121-1/+1
* | separate dfrn introductions from email when it comes to expiration of blocked...friendica2011-12-111-1/+31
|/
* browser_update settingsfriendica2011-12-112-3/+12
* system support for personal configurable ajax update intervalfriendica2011-12-114-8/+19
* \o/ smileyfriendica2011-12-113-2/+3
* typo in db sqlfriendica2011-12-101-1/+1
* Merge branch 'pull'friendica2011-12-091-4/+15
|\
| * Merge pull request #17 from zzottel/masterfriendica2011-12-081-4/+15
| |\
| | * fixed some glitches in testbubble themezottel2011-12-081-4/+15
| |/
* | cannot register at all when multiple_pages is not allowedfriendica2011-12-091-1/+6
* | revupfriendica2011-12-091-1/+1
* | fix diaspora's illegal webfinger xml before sending to parserfriendica2011-12-091-0/+3
|/
* missing templatefriendica2011-12-071-0/+13
* api post default to default post permissions was brokenfriendica2011-12-073-18/+22
* w3c valid cleanupfriendica2011-12-061-2/+4
* preg_quote search stringsfriendica2011-12-062-11/+4
* pm repliesfriendica2011-12-068-45/+158
* include diaspora mentions in personal (requires adding a Diaspora profile url...friendica2011-12-064-6/+24
* Merge pull request #16 from zzottel/masterfriendica2011-12-061-5/+11
|\
| * unpause the stream when posting a comment or liking/dislikingzottel2011-12-061-5/+11
* | copied code styling from duepuntozero to quattro themeTobias Diekershoff2011-12-062-1/+22
|/
* Merge pull request #15 from zzottel/masterfriendica2011-12-061-10/+10
|\
| * Merge remote branch 'upstream/master'zottel2011-12-0612-26/+49
| |\
| * | Added stopping automatic reloads with Ctrl-Space. Will stay stopped till next...zottel2011-12-061-10/+10
* | | d* pmfriendica2011-12-067-11/+115
| |/ |/|
* | hide some contacts from othersfriendica2011-12-054-6/+13
* | Merge branch 'pull'friendica2011-12-051-0/+6
|\ \
| * | Merge pull request #14 from zzottel/masterfabrixxm2011-12-051-0/+6
| |\|
| | * added #pausezottel2011-12-051-0/+6
| |/
* | maintain backward compatibility with old PMsfriendica2011-12-052-10/+20
* | data structures to support hidden friendsfriendica2011-12-057-10/+16
|/
* add conv structurefriendica2011-12-052-3/+44
* Merge pull request #13 from zzottel/masterfabrixxm2011-12-051-0/+2
|\
| * added img properties to get good results on all screen sizeszottel2011-12-051-0/+2
|/
* more d* PM stufffriendica2011-12-043-83/+74
* fix incorrect default authorfriendica2011-12-041-0/+4
* typofriendica2011-12-041-2/+2
* fix author-name when missing on commentsfriendica2011-12-041-0/+3
* unix style homedirfriendica2011-12-041-0/+3
* add a bookmark index, needed by network queriesfriendica2011-12-033-3/+9
* bug #232friendica2011-12-032-8/+14
* Merge pull request #12 from zzottel/masterfabrixxm2011-12-021-1/+1
|\
| * Take out overflow: hidden; from .wall-item-outside-wrapper to fixzottel2011-12-021-1/+1
|/
* Merge pull request #11 from fabrixxm/masterfabrixxm2011-12-021-4/+19
|\
| * ping: mention rewordingFabio Comuni2011-12-021-1/+1
| * ping: add @-tag notifs, fix intros urlFabio Comuni2011-12-011-4/+19