aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-1511-22/+75
|\
| * more recycle fixes for plaintextfriendica2012-03-151-1/+1
| * fix recycle symbol when using plaintext editorfriendica2012-03-151-1/+1
| * Merge branch 'pull'friendica2012-03-1510-21/+74
| |\
| | * Merge https://github.com/friendica/friendica into pullfriendica2012-03-1510-21/+74
| | |\
| | | * add links to wall, photos, events, etc to aside on networkpage, fixes in csstommy tomson2012-03-1510-21/+74
* | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-1537-300/+1266
|\| | |
| * | | don't allow multiple friends with http/https same person, don't show mail2 co...friendica2012-03-141-3/+18
| * | | roll protocol version due to ssl_policy settingsfriendica2012-03-141-1/+1
| * | | force login to ssl on SSL_POLICY_SELFSIGNfriendica2012-03-143-9/+13
| * | | basic ssl_policy for important modulesfriendica2012-03-1411-130/+140
| * | | ssl_policy stufffriendica2012-03-145-11/+103
| * | | revupfriendica2012-03-141-1/+1
| |/ /
| * | Merge pull request #132 from campino/masterfriendica2012-03-1411-119/+828
| |\ \
| | * \ Merge branch 'master' of git://github.com/friendica/friendicaAlexander Kampmann2012-03-1481-708/+7818
| | |\ \
| | * | | splitted tests into several filesAlexander Kampmann2012-03-144-146/+269
| | * | | removed done TODOAlexander Kampmann2012-03-141-2/+1
| | * | | get_tags tests corrected. They test for the right things now. Alexander Kampmann2012-03-142-61/+195
| | * | | get tags test improvedAlexander Kampmann2012-03-122-27/+92
| | * | | splitted test cases.Alexander Kampmann2012-03-093-192/+255
| | * | | changed a test stringAlexander Kampmann2012-03-091-2/+2
| | * | | Merge branch 'master' of git://github.com/friendica/friendicaAlexander Kampmann2012-03-09102-224/+11487
| | |\ \ \
| | * | | | added some testsAlexander Kampmann2012-03-093-44/+102
| | * | | | added library and include to .htaccessAlexander Kampmann2012-03-081-0/+3
| | * | | | excludes reports from gitAlexander Kampmann2012-03-081-0/+3
| | * | | | better testsAlexander Kampmann2012-03-083-144/+265
| | * | | | Merge branch 'master' of git://github.com/friendica/friendicaAlexander Kampmann2012-03-0759-661/+1213
| | |\ \ \ \
| | * \ \ \ \ mergedAlexander Kampmann2012-03-07112-2723/+7901
| | |\ \ \ \ \
| | * | | | | | added test blueprints, fixed? encoding issuesAlexander Kampmann2012-03-052-10/+150
| * | | | | | | Merge pull request #133 from tonybaldwin/masterfriendica2012-03-142-0/+102
| |\ \ \ \ \ \ \
| | * | | | | | | added slack-NS, non-scrolly, slackr-based theme.Tony Baldwin2012-03-132-0/+102
| * | | | | | | | Merge branch 'pull'friendica2012-03-148-8/+190
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge https://github.com/friendica/friendica into pullfriendica2012-03-148-8/+190
| | |\ \ \ \ \ \ \ \
| * | | | | | | | | | Merge branch 'pull'friendica2012-03-139-128/+247
| |\| | | | | | | | |
| | * | | | | | | | | Merge pull request #131 from simonlnu/masterSimon2012-03-139-128/+247
| | |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | | addon settings form errorfriendica2012-03-132-2/+2
| |/ / / / / / / / / /
| * | | / / / / / / / more work on filer, comment level and file tag removalfriendica2012-03-137-24/+58
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-140-0/+0
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | 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
| | |/ / / / / / | |/| | | | | |
| * | | | | | | 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
| |\| | | | | |
| | * | | | | | 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
| | |\ \ \ \ \ \ \ \