aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | Removed changesMichael Vogel2012-03-112-19/+11
| | * | Merge commit 'upstream/master'Michael Vogel2012-03-1162-555/+7192
| | |\ \
| | * | | Added config options for the item cache and the ostatus priorityMichael Vogel2012-03-111-0/+6
| | * | | Item cache now is one day.Michael Vogel2012-03-111-1/+1
| | * | | Corrected some git problemsMichael Vogel2012-03-112-89/+0
| | * | | Cache: item cache now has an autodelete of old files. The pages plugin now se...Michael Vogel2012-03-113-3/+17
| | * | | Pages: Show every community page - even from foreign servers (with caching)Michael Vogel2012-03-112-12/+61
| | * | | New plugin that shows community pages in the sidebarMichael Vogel2012-03-112-0/+42
| | * | | Caching improved.Michael Vogel2012-03-101-13/+11
| | * | | Enabled Caching for items. Changed color of tags in diabook.Michael Vogel2012-03-102-3/+18
| | * | | New config options if ostatus polling should use the priority in the contactsMichael Vogel2012-03-101-1/+4
| | * | | Mail: Removing signatures, gpg, unnecessary line breaksMichael Vogel2012-03-103-2/+240
| | * | | diabook: Moving the location between the iconsMichael Vogel2012-03-103-5/+7
| | * | | Merge commit 'upstream/master'Michael Vogel2012-03-09255-3476/+20733
| | |\ \ \
| | * | | | html2bbcode: don't convert sizes and fonts.Michael2012-03-021-3/+7
| | * | | | Merge remote branch 'upstream/master'Michael2012-02-283-7/+9
| | |\ \ \ \
| | * \ \ \ \ Merge remote branch 'upstream/master'Michael2012-02-2722-55/+154
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote branch 'upstream/master'Michael2012-02-2713-36/+54
| | |\ \ \ \ \ \
| * | | | | | | | fixed the sidebar edit thingy. haven't synced dispy yet.Simon L'nu2012-03-152-24/+27
| * | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-150-0/+0
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge pull request #135 from simonlnu/masterSimon2012-03-1516-85/+115
| |\ \ \ \ \ \ \
| | * | | | | | | commit latest to dispy-dark. fixes in html css and jsSimon L'nu2012-03-1516-85/+115
| | * | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-1511-22/+75
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-1537-300/+1266
| | |\ \ \ \ \ \ \
| | * | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-140-0/+0
* | | | | | | | | | track whether contact is a community page or notfriendica2012-03-156-7/+29
|/ / / / / / / / /
* | | | | | | | | 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
* | | | | | | | | | 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