aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'upstream/master'zottel2012-03-1510-21/+74
|\
| * add links to wall, photos, events, etc to aside on networkpage, fixes in csstommy tomson2012-03-1510-21/+74
* | Merge remote branch 'upstream/master'zottel2012-03-148-8/+190
|\ \
| * \ Merge pull request #134 from simonlnu/masterSimon2012-03-1454-321/+740
| |\ \ | | |/ | |/|
| | * PHP Fatal error: Call-time pass-by-reference has been removed in mod/item.ph...Simon L'nu2012-03-141-1/+1
| * | fix in navtommy tomson2012-03-141-4/+0
| * | add links to home, profile, photos, events, notes to aside in network-streamtommy tomson2012-03-146-3/+189
* | | Merge branch 'pull'friendica2012-03-139-128/+247
|\ \ \
| * \ \ Merge pull request #131 from simonlnu/masterSimon2012-03-139-128/+247
| |\ \ \ | | | |/ | | |/|
| | * | massive work done to both dispys, mostly -darkSimon L'nu2012-03-149-128/+247
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-1336-192/+426
| | |\ \
| | * \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-131-0/+27
| | |\ \ \
| | * \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-1358-1496/+115
| | |\ \ \ \
| | * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-120-0/+0
* | | | | | | addon settings form errorfriendica2012-03-132-2/+2
|/ / / / / /
* | | | / / more work on filer, comment level and file tag removalfriendica2012-03-137-24/+58
| |_|_|/ / |/| | | |
* | | | | sort inbox by recently replied conversations firstfriendica2012-03-131-1/+1
* | | | | file as widget and basic filing implementation for duepuntozero,slackrfriendica2012-03-1311-4/+101
* | | | | Merge branch 'pull'friendica2012-03-131-122/+140
|\ \ \ \ \
| * \ \ \ \ Merge pull request #130 from CatoTH/masterfriendica2012-03-131-122/+140
| |\ \ \ \ \
| | * | | | | In HTML2BBCode: fetch the URL of [EMBED] using JavaScript instead of an ajax-...Tobias Hößl2012-03-131-122/+140
| | * | | | | Merge branch 'master' of git://github.com/friendica/friendicaTobias Hößl2012-03-1328-51/+319
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
* | | / | | | don't count self in number of contatcsfriendica2012-03-131-4/+2
|/ / / / / /
* | | | | | Merge branch 'pull'friendica2012-03-1323-59/+163
|\ \ \ \ \ \
| * | | | | | Merge pull request #129 from CatoTH/masterfriendica2012-03-1323-59/+163
| |\| | | | | | | |/ / / / | |/| | | |
| | * | | | Some security against XSRF-attacksTobias Hößl2012-03-1213-39/+132
| | * | | | Merge branch 'master' of git://github.com/friendica/friendicaTobias Hößl2012-03-1212-157/+255
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' of git://github.com/friendica/friendicaTobias Hößl2012-03-112-7/+29
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of git://github.com/friendica/friendicaTobias Hößl2012-03-1162-559/+7162
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendica/friendicaTobias Hößl2012-03-09252-3416/+20704
| | |\ \ \ \ \ \ \
| | * | | | | | | | A 'PHP Fatal error: Call to a member function getElementsByTagName() on a no...Tobias Hößl2012-03-031-1/+1
| | * | | | | | | | Mostly some checks in order to avoid Notices; 1 real bugfix in /mod/network.phpTobias Hößl2012-02-284-11/+19
| | * | | | | | | | Merge remote branch 'upstream/master'Tobias Hößl2012-02-2857-1256/+2380
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Avoid noticesTobias Hößl2012-02-282-2/+2
| | * | | | | | | | | contact.network is used later to check if a direct link or a redirect by /red...Tobias Hößl2012-02-281-1/+1
| | * | | | | | | | | wasn't actually changed beforeTobias Hößl2012-02-281-2/+2
| | * | | | | | | | | Avoid a noticeTobias Hößl2012-02-281-0/+1
| | * | | | | | | | | Avoid a NoticeTobias Hößl2012-02-271-1/+1
| | * | | | | | | | | Avoid a NoticeTobias Hößl2012-02-271-1/+3
| | * | | | | | | | | Avoid a NoticeTobias Hößl2012-02-271-1/+1
* | | | | | | | | | | invite potential connectees to the free social webfriendica2012-03-134-2/+19
|/ / / / / / / / / /
* | | | | | | | / / initial tag display for categories and save-to-file - suitable for testing bu...friendica2012-03-131-0/+27
| |_|_|_|_|_|_|/ / |/| | | | | | | |
* | | | | | | | | click anywhere to close notifications -> zeros and bubblesfriendica2012-03-128-0/+39
* | | | | | | | | Merge branch 'pull'friendica2012-03-1218-50/+252
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge pull request #128 from tomtom84/mastertomtom842012-03-121-1/+1
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | fix csstommy tomson2012-03-131-1/+1
| |/ / / / / / / /
| * | | | | | | | Merge pull request #127 from tomtom84/mastertomtom842012-03-1244-1490/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | use fancybox instead of lightboxtommy tomson2012-03-1344-1490/+2
| * | | | | | | | | Merge pull request #126 from tomtom84/mastertomtom842012-03-126-4/+72
| |\| | | | | | | | | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | fixestommy tomson2012-03-126-4/+72