| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | 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 |
| | |\
| |/
|/| |
|
| * | | 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 |
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-15 | 37 | -300/+1266 |
| | | | |\
| |_|_|/
|/| | | |
|
| * | | | | 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 |
| | |\ \ \ |
|
| | * | | | | splitted tests into several files | Alexander Kampmann | 2012-03-14 | 4 | -146/+269 |
| | * | | | | removed done TODO | Alexander Kampmann | 2012-03-14 | 1 | -2/+1 |
| | * | | | | get_tags tests corrected. They test for the right things now. | Alexander Kampmann | 2012-03-14 | 2 | -61/+195 |
| | * | | | | get tags test improved | Alexander Kampmann | 2012-03-12 | 2 | -27/+92 |
| | * | | | | splitted test cases. | Alexander Kampmann | 2012-03-09 | 3 | -192/+255 |
| | * | | | | changed a test string | Alexander Kampmann | 2012-03-09 | 1 | -2/+2 |
| | * | | | | Merge branch 'master' of git://github.com/friendica/friendica | Alexander Kampmann | 2012-03-09 | 102 | -224/+11487 |
| | |\ \ \ \ |
|
| | * | | | | | added some tests | Alexander Kampmann | 2012-03-09 | 3 | -44/+102 |
| | * | | | | | added library and include to .htaccess | Alexander Kampmann | 2012-03-08 | 1 | -0/+3 |
| | * | | | | | excludes reports from git | Alexander Kampmann | 2012-03-08 | 1 | -0/+3 |
| | * | | | | | better tests | Alexander Kampmann | 2012-03-08 | 3 | -144/+265 |
| | * | | | | | Merge branch 'master' of git://github.com/friendica/friendica | Alexander Kampmann | 2012-03-07 | 59 | -661/+1213 |
| | |\ \ \ \ \ |
|
| | * \ \ \ \ \ | merged | Alexander Kampmann | 2012-03-07 | 112 | -2723/+7901 |
| | |\ \ \ \ \ \ |
|
| | * | | | | | | | added test blueprints, fixed? encoding issues | Alexander Kampmann | 2012-03-05 | 2 | -10/+150 |
| * | | | | | | | | Merge pull request #133 from tonybaldwin/master | friendica | 2012-03-14 | 2 | -0/+102 |
| |\ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | added slack-NS, non-scrolly, slackr-based theme. | Tony Baldwin | 2012-03-13 | 2 | -0/+102 |
| * | | | | | | | | | Merge branch 'pull' | friendica | 2012-03-14 | 8 | -8/+190 |
| |\ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ | Merge https://github.com/friendica/friendica into pull | friendica | 2012-03-14 | 8 | -8/+190 |
| | |\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | Merge branch 'pull' | friendica | 2012-03-13 | 9 | -128/+247 |
| |\| | | | | | | | | | |
|
| | * | | | | | | | | | | Merge pull request #131 from simonlnu/master | Simon | 2012-03-13 | 9 | -128/+247 |
| | |\ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | addon settings form error | friendica | 2012-03-13 | 2 | -2/+2 |
| |/ / / / / / / / / / / |
|
| * | | / / / / / / / / | more work on filer, comment level and file tag removal | friendica | 2012-03-13 | 7 | -24/+58 |
| | |_|/ / / / / / / /
|/| | | | | | | | | |
|
| | | | | | | | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-14 | 0 | -0/+0 |
| | | | |_|_|_|_|_|/
| | |/| | | | | | |
|
| | | * | | | | | | | Merge pull request #134 from simonlnu/master | Simon | 2012-03-14 | 54 | -321/+740 |
| | | |\ \ \ \ \ \ \
| | | |_|_|_|_|_|/
| | |/| | | | | | |
|
| | | | * | | | | | | PHP Fatal error: Call-time pass-by-reference has been removed in mod/item.ph... | Simon L'nu | 2012-03-14 | 1 | -1/+1 |
| | | |/ / / / / /
| |/| | | | | | |
|
| | * | | | | | | | massive work done to both dispys, mostly -dark | Simon L'nu | 2012-03-14 | 9 | -128/+247 |
| | * | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-13 | 36 | -192/+426 |
| | |\ \ \ \ \ \ \
| |/ / / / / / /
|/| | | | | | | |
|
| * | | | | | | | | sort inbox by recently replied conversations first | friendica | 2012-03-13 | 1 | -1/+1 |
| * | | | | | | | | file as widget and basic filing implementation for duepuntozero,slackr | friendica | 2012-03-13 | 11 | -4/+101 |
| * | | | | | | | | Merge branch 'pull' | friendica | 2012-03-13 | 1 | -122/+140 |
| |\ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ | Merge pull request #130 from CatoTH/master | friendica | 2012-03-13 | 1 | -122/+140 |
| | |\ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | In HTML2BBCode: fetch the URL of [EMBED] using JavaScript instead of an ajax-... | Tobias Hößl | 2012-03-13 | 1 | -122/+140 |
