| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| ... | |
| | | | * | | | Merge pull request #153 from simonlnu/master | Simon | 2012-03-20 | 3 | -13/+148 |
| | | | |\ \ \ |
|
| | | | | * | | | some tweakings for intro boxes (finally got an intro i could see :). dispy sy... | Simon L'nu | 2012-03-20 | 3 | -13/+148 |
| | | | | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-20 | 1 | -4/+5 |
| | | | | |\ \ \
| | | | |/ / /
| | | |/| | | |
|
| | | | | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-20 | 6 | -103/+98 |
| | | | | |\ \ \ |
|
| | | | | * \ \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-19 | 10 | -30/+66 |
| | | | | |\ \ \ \ |
|
| | | | | * | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-18 | 0 | -0/+0 |
| | | * | | | | | | | missed a default profile photo replacement in notifications | friendica | 2012-03-20 | 1 | -1/+1 |
| | | * | | | | | | | change default profile photo to something more interesting than a reddish bro... | friendica | 2012-03-20 | 9 | -10/+10 |
| | | * | | | | | | | slightly relax overly strict permissions in community and search to match tho... | friendica | 2012-03-20 | 3 | -9/+12 |
| | | |/ / / / / / |
|
| | | * | | / / / | bug #339 - lostpass sending to username, not email | friendica | 2012-03-20 | 1 | -4/+5 |
| | | | |_|/ / /
| | |/| | | | |
|
| | | * | | | | | 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 |
| | | |\ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | cleanup after openid refactoring | friendica | 2012-03-19 | 1 | -1/+6 |
| | | * | | | | | | | | | refactor openid logins/registrations | friendica | 2012-03-19 | 3 | -77/+60 |
| | | | |_|_|/ / / / /
| | |/| | | | | | | |
|
| | * | | | | | | | | | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-03-18 | 6 | -23/+15 |
| | |\ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-03-17 | 3 | -4/+4 |
| | |\ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-03-17 | 31 | -321/+504 |
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-03-16 | 51 | -189/+619 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-03-15 | 38 | -284/+1398 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-03-14 | 47 | -338/+752 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-03-13 | 29 | -58/+379 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-03-12 | 10 | -156/+196 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | | Revert "OpenID: display error msg if ID URL used to register an account does ... | Tobias Diekershoff | 2012-03-11 | 1 | -9/+4 |
| | * | | | | | | | | | | | | | | | | | OpenID: display error msg if ID URL used to register an account does not exist | Tobias Diekershoff | 2012-03-11 | 1 | -4/+9 |
| * | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'friendica/master' | Fabio Comuni | 2012-03-19 | 4 | -3/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|_|_|/ / / / / / / /
| |/| | | | | | | | | / / / / / / /
| |_|_|_|_|_|_|_|_|_|/ / / / / / /
|/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | some openid fixes, use identity url from openid server and normalise it. | friendica | 2012-03-19 | 4 | -3/+15 |
| * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'friendica/master' | Fabio Comuni | 2012-03-19 | 161 | -1042/+3487 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | 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 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 |
| | | |_|_|_|_|_|_|_|/ / / / /
| |/| | | | | | | | | | | | |
|
