| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| ... | |
| * | | | | | Merge branch 'pull' | friendica | 2012-03-15 | 15 | -32/+86 |
| |\ \ \ \ \ |
|
| | * \ \ \ \ | Merge pull request #137 from tomtom84/master | tomtom84 | 2012-03-15 | 15 | -32/+86 |
| | |\ \ \ \ \ |
|
| | | * | | | | | added icons to profile_side, fixes in css | tommy tomson | 2012-03-16 | 15 | -32/+86 |
| | |/ / / / / |
|
| * / / / / / | undo git stuffup | friendica | 2012-03-15 | 3 | -4/+8 |
| |/ / / / / |
|
| * | | | | | Merge branch 'pull' | friendica | 2012-03-15 | 28 | -157/+448 |
| |\ \ \ \ \ |
|
| | * \ \ \ \ | Merge pull request #136 from annando/master | friendica | 2012-03-15 | 12 | -71/+329 |
| | |\ \ \ \ \ |
|
| | | * | | | | | html2bbcode: Disabled size conversion | Michael Vogel | 2012-03-15 | 1 | -9/+9 |
| | | * | | | | | Merge commit 'upstream/master' | Michael Vogel | 2012-03-15 | 114 | -870/+2820 |
| | | |\ \ \ \ \ |
|
| | | * | | | | | | Mail: Subject are now with working "Re:" | Michael Vogel | 2012-03-12 | 2 | -43/+14 |
| | | * | | | | | | Removing test exports | Michael Vogel | 2012-03-11 | 2 | -4/+4 |
| | | * | | | | | | Missing field in database.sql | Michael Vogel | 2012-03-11 | 1 | -0/+1 |
| | | * | | | | | | Removed changes | Michael Vogel | 2012-03-11 | 2 | -19/+11 |
| | | * | | | | | | Merge commit 'upstream/master' | Michael Vogel | 2012-03-11 | 62 | -555/+7192 |
| | | |\ \ \ \ \ \ |
|
| | | * | | | | | | | Added config options for the item cache and the ostatus priority | Michael Vogel | 2012-03-11 | 1 | -0/+6 |
| | | * | | | | | | | Item cache now is one day. | Michael Vogel | 2012-03-11 | 1 | -1/+1 |
| | | * | | | | | | | Corrected some git problems | Michael Vogel | 2012-03-11 | 2 | -89/+0 |
| | | * | | | | | | | Cache: item cache now has an autodelete of old files. The pages plugin now se... | Michael Vogel | 2012-03-11 | 3 | -3/+17 |
| | | * | | | | | | | Pages: Show every community page - even from foreign servers (with caching) | Michael Vogel | 2012-03-11 | 2 | -12/+61 |
| | | * | | | | | | | New plugin that shows community pages in the sidebar | Michael Vogel | 2012-03-11 | 2 | -0/+42 |
| | | * | | | | | | | Caching improved. | Michael Vogel | 2012-03-10 | 1 | -13/+11 |
| | | * | | | | | | | Enabled Caching for items. Changed color of tags in diabook. | Michael Vogel | 2012-03-10 | 2 | -3/+18 |
| | | * | | | | | | | New config options if ostatus polling should use the priority in the contacts | Michael Vogel | 2012-03-10 | 1 | -1/+4 |
| | | * | | | | | | | Mail: Removing signatures, gpg, unnecessary line breaks | Michael Vogel | 2012-03-10 | 3 | -2/+240 |
| | | * | | | | | | | diabook: Moving the location between the icons | Michael Vogel | 2012-03-10 | 3 | -5/+7 |
| | | * | | | | | | | Merge commit 'upstream/master' | Michael Vogel | 2012-03-09 | 255 | -3476/+20733 |
| | | |\ \ \ \ \ \ \ |
|
| | | * | | | | | | | | html2bbcode: don't convert sizes and fonts. | Michael | 2012-03-02 | 1 | -3/+7 |
| | | * | | | | | | | | Merge remote branch 'upstream/master' | Michael | 2012-02-28 | 3 | -7/+9 |
| | | |\ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | Michael | 2012-02-27 | 22 | -55/+154 |
| | | |\ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | Michael | 2012-02-27 | 13 | -36/+54 |
| | | |\ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | fixed the sidebar edit thingy. haven't synced dispy yet. | Simon L'nu | 2012-03-15 | 2 | -24/+27 |
| | * | | | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-15 | 0 | -0/+0 |
| | | |_|_|_|_|_|/ / / / /
| |/| | | | | | | | | | |
|
| | * | | | | | | | | | | | Merge pull request #135 from simonlnu/master | Simon | 2012-03-15 | 16 | -85/+115 |
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | commit latest to dispy-dark. fixes in html css and js | Simon L'nu | 2012-03-15 | 16 | -85/+115 |
| | | * | | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-15 | 11 | -22/+75 |
| | | |\ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / /
| |/| | | | | | | | | | | |
|
| | | * | | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-15 | 37 | -300/+1266 |
| | | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-14 | 0 | -0/+0 |
| * | | | | | | | | | | | | | | track whether contact is a community page or not | friendica | 2012-03-15 | 6 | -7/+29 |
| |/ / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | more recycle fixes for plaintext | friendica | 2012-03-15 | 1 | -1/+1 |
| * | | | | | | | | | | | | | fix recycle symbol when using plaintext editor | friendica | 2012-03-15 | 1 | -1/+1 |
| * | | | | | | | | | | | | | Merge branch 'pull' | friendica | 2012-03-15 | 10 | -21/+74 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| |_|/ / / / / / / / / / /
|/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-03-15 | 10 | -21/+74 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | add links to wall, photos, events, etc to aside on networkpage, fixes in css | tommy tomson | 2012-03-15 | 10 | -21/+74 |
| * | | | | | | | | | | | | | | don't allow multiple friends with http/https same person, don't show mail2 co... | friendica | 2012-03-14 | 1 | -3/+18 |
| * | | | | | | | | | | | | | | roll protocol version due to ssl_policy settings | friendica | 2012-03-14 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | force login to ssl on SSL_POLICY_SELFSIGN | friendica | 2012-03-14 | 3 | -9/+13 |
| * | | | | | | | | | | | | | | basic ssl_policy for important modules | friendica | 2012-03-14 | 11 | -130/+140 |
| * | | | | | | | | | | | | | | ssl_policy stuff | friendica | 2012-03-14 | 5 | -11/+103 |
| * | | | | | | | | | | | | | | revup | friendica | 2012-03-14 | 1 | -1/+1 |
| |/ / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | Merge pull request #132 from campino/master | friendica | 2012-03-14 | 11 | -119/+828 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/friendica/friendica | Alexander Kampmann | 2012-03-14 | 81 | -708/+7818 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
