| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge remote branch 'upstream/master' | zottel | 2012-03-20 | 5 | -102/+81 |
| |\ |
|
| | * | add IP address to failed login log message | friendica | 2012-03-19 | 1 | -1/+2 |
| | * | Merge pull request #152 from beardy-unixer/84f8e2eaa87c90473ce79ebcd4f76f3657... | friendica | 2012-03-19 | 1 | -24/+2 |
| | |\ |
|
| | | * | modified: include/text.php | Thomas | 2012-03-19 | 1 | -3/+2 |
| | | * | modified: include/text.php | Thomas | 2012-03-19 | 1 | -21/+0 |
| | | * | Merge remote-tracking branch 'main/master' | Thomas | 2012-03-19 | 207 | -1628/+11133 |
| | | |\ |
|
| | | * \ | Merge remote-tracking branch 'upstream/master' | Thomas | 2012-03-09 | 83 | -123/+11136 |
| | | |\ \ |
|
| | * | \ \ | Merge pull request #150 from fabrixxm/master | friendica | 2012-03-19 | 1 | -1/+1 |
| | |\ \ \ \ |
|
| | | * \ \ \ | Merge remote-tracking branch 'friendica/master' | Fabio Comuni | 2012-03-19 | 161 | -1042/+3487 |
| | | |\ \ \ \ |
|
| | | * | | | | | add 'loggin_out' hook | Fabio Comuni | 2012-03-12 | 1 | -1/+1 |
| | * | | | | | | cleanup after openid refactoring | friendica | 2012-03-19 | 1 | -1/+6 |
| | * | | | | | | refactor openid logins/registrations | friendica | 2012-03-19 | 3 | -77/+60 |
| | | |_|_|_|/
| |/| | | | |
|
| | * | | | | | some openid fixes, use identity url from openid server and normalise it. | friendica | 2012-03-19 | 4 | -3/+15 |
| | | |/ / /
| |/| | | |
|
| * | | | | | Merge remote branch 'upstream/master' | zottel | 2012-03-19 | 2 | -1/+17 |
| |\| | | | |
|
| | * | | | | support "no_smilies" | friendica | 2012-03-19 | 1 | -0/+5 |
| | * | | | | ctrl + left|right cursor keys to prev/next photos | friendica | 2012-03-19 | 1 | -1/+12 |
| * | | | | | Merge remote branch 'upstream/master' | zottel | 2012-03-19 | 24 | -66/+113 |
| |\| | | | |
|
| | * | | | | Merge pull request #149 from CatoTH/master | Simon | 2012-03-19 | 2 | -9/+13 |
| | |\ \ \ \ |
|
| | | * | | | | Existing photos could not be used as profile photos anymore - should be fixed... | Tobias Hößl | 2012-03-19 | 2 | -9/+13 |
| | * | | | | | community discovery cont., cleanup of DB debugging | friendica | 2012-03-18 | 8 | -21/+53 |
| | * | | | | | Merge branch 'pull' | friendica | 2012-03-18 | 5 | -10/+29 |
| | |\ \ \ \ \ |
|
| | | * | | | | | Merge pull request #147 from CatoTH/master | friendica | 2012-03-18 | 5 | -10/+29 |
| | | |\| | | | |
|
| | | | * | | | | CSRF-Protection in the group-related form (creating, renaming and dropping a ... | Tobias Hößl | 2012-03-18 | 5 | -10/+29 |
| | * | | | | | | revup | friendica | 2012-03-18 | 1 | -1/+1 |
| | |/ / / / / |
|
| | * | | | | | Merge pull request #148 from simonlnu/master | Simon | 2012-03-18 | 2 | -2/+2 |
| | |\ \ \ \ \ |
|
| | | * | | | | | fix the comment box being too wide and looking off-kilter | Simon L'nu | 2012-03-18 | 2 | -2/+2 |
| | | * | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-18 | 8 | -25/+17 |
| | | |\ \ \ \ \
| | |/ / / / /
| |/| | | | | |
|
| | * | | | | | | Merge pull request #146 from CatoTH/master | friendica | 2012-03-18 | 2 | -2/+2 |
| | |\ \ \ \ \ \
| | | |/ / / /
| | |/| | | | |
|
| | | * | | | | | replace split() by explode(); split is deprecated | Tobias Hößl | 2012-03-18 | 2 | -2/+2 |
| | |/ / / / / |
|
| | * | | | | | lost changes to tinymce/bbcode | friendica | 2012-03-17 | 1 | -61/+136 |
| | * | | | | | remove admin view of local directory | friendica | 2012-03-17 | 2 | -151/+63 |
| | * | | | | | bug #337, call template_unescape() only at the end of template processing | friendica | 2012-03-17 | 4 | -5/+5 |
| | * | | | | | queue optimisation - back off delivery attempts to once per hour after the fi... | friendica | 2012-03-17 | 1 | -3/+8 |
| | | * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-17 | 3 | -4/+4 |
| | | |\ \ \ \
| | |/ / / /
| |/| | | | |
|
| | | * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-17 | 0 | -0/+0 |
| * | | | | | | Merge remote branch 'upstream/master' | zottel | 2012-03-18 | 8 | -22/+21 |
| |\| | | | | |
|
| | * | | | | | compare ssl_policy precisely in case somebody was bitten by template processo... | friendica | 2012-03-17 | 1 | -1/+1 |
| | * | | | | | template processor broken with foreach k=>v and k is integer 0 | friendica | 2012-03-17 | 2 | -3/+3 |
| | |/ / / / |
|
| | * | | | | cut/paste error | friendica | 2012-03-17 | 1 | -1/+1 |
| | * | | | | scheme checking for webservers without $_SERVER['HTTPS'] | friendica | 2012-03-16 | 1 | -1/+6 |
| | * | | | | Merge pull request #145 from simonlnu/master | Simon | 2012-03-16 | 4 | -16/+10 |
| | |\ \ \ \ |
|
| | | * | | | | [fix] whitespace in photo_view and like_noshare. dispy-dark clean up | Simon L'nu | 2012-03-17 | 4 | -16/+10 |
| | | * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-17 | 0 | -0/+0 |
| | |/ / / / |
|
| * | | | | | Merge remote branch 'upstream/master' | zottel | 2012-03-17 | 3 | -7/+9 |
| |\| | | | |
|
| | * | | | | Merge pull request #144 from simonlnu/master | Simon | 2012-03-16 | 3 | -7/+9 |
| | |\ \ \ \ |
|
| | | * | | | | remove auto-complete from darkzero-NS, dispys, since the comment one is now g... | Simon L'nu | 2012-03-16 | 2 | -6/+0 |
| | | * | | | | make auto-complete work in more places | Simon L'nu | 2012-03-16 | 1 | -1/+9 |
| | | * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-16 | 0 | -0/+0 |
| | |/ / / / |
|
| * | | | | | Merge remote branch 'upstream/master' | zottel | 2012-03-17 | 28 | -306/+488 |
| |\| | | | |
|
| | * | | | | Merge pull request #143 from simonlnu/master | Simon | 2012-03-16 | 1 | -0/+3 |
| | |\ \ \ \ |
|
