| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| ... | |
| | | | * | | | | | | | | | | | | 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 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 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 |
| | | | * | | | | | | | | | | | | | fix in nav | tommy tomson | 2012-03-14 | 1 | -4/+0 |
| | * | | | | | | | | | | | | | | | Merge branch 'pull' | friendica | 2012-03-13 | 9 | -128/+247 |
| | |\| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | Merge pull request #131 from simonlnu/master | Simon | 2012-03-13 | 9 | -128/+247 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | 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 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / /
| | | | |/| | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-13 | 1 | -0/+27 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-13 | 58 | -1496/+115 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-12 | 0 | -0/+0 |
| | * | | | | | | | | | | | | | | | | | 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 |
| | | |_|_|/ / / / / / / / / / / /
| |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | 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 |
| | | | * | | | | | | | | | | | | | | | Merge branch 'master' of git://github.com/friendica/friendica | Tobias Hößl | 2012-03-13 | 28 | -51/+319 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|/ / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | |
|
| | * | | / | | | | | | | | | | | | | | don't count self in number of contatcs | friendica | 2012-03-13 | 1 | -4/+2 |
| | |/ / / / / / / / / / / / / / / / |
|
| | * | | | | | | | | | | | | | | | | Merge branch 'pull' | friendica | 2012-03-13 | 23 | -59/+163 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | | | Merge pull request #129 from CatoTH/master | friendica | 2012-03-13 | 23 | -59/+163 |
| | | |\| | | | | | | | | | | | | | |
| | | |/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Some security against XSRF-attacks | Tobias Hößl | 2012-03-12 | 13 | -39/+132 |
| | | | * | | | | | | | | | | | | | | Merge branch 'master' of git://github.com/friendica/friendica | Tobias Hößl | 2012-03-12 | 12 | -157/+255 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|_|_|_|_|_|_|_|/ / /
| | | | |/| | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Merge branch 'master' of git://github.com/friendica/friendica | Tobias Hößl | 2012-03-11 | 2 | -7/+29 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|_|_|_|_|_|_|_|/ / /
| | | | |/| | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | Merge branch 'master' of git://github.com/friendica/friendica | Tobias Hößl | 2012-03-11 | 62 | -559/+7162 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/friendica/friendica | Tobias Hößl | 2012-03-09 | 252 | -3416/+20704 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|_|_|_|_|_|_|_|_|/ / /
| | | | |/| | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | A 'PHP Fatal error: Call to a member function getElementsByTagName() on a no... | Tobias Hößl | 2012-03-03 | 1 | -1/+1 |
| | | | * | | | | | | | | | | | | | | | Mostly some checks in order to avoid Notices; 1 real bugfix in /mod/network.php | Tobias Hößl | 2012-02-28 | 4 | -11/+19 |
| | | | * | | | | | | | | | | | | | | | Merge remote branch 'upstream/master' | Tobias Hößl | 2012-02-28 | 57 | -1256/+2380 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | | Avoid notices | Tobias Hößl | 2012-02-28 | 2 | -2/+2 |
| | | | * | | | | | | | | | | | | | | | | contact.network is used later to check if a direct link or a redirect by /red... | Tobias Hößl | 2012-02-28 | 1 | -1/+1 |
| | | | * | | | | | | | | | | | | | | | | wasn't actually changed before | Tobias Hößl | 2012-02-28 | 1 | -2/+2 |
