| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of git://github.com/friendica/friendica | Alexander Kampmann | 2012-03-22 | 498 | -11542/+24259 |
| |\ | | | | | | | | | | | | | | | Conflicts: boot.php database.sql include/template_processor.php update.php | ||||
| | * | missing tooltip for "file as" | friendica | 2012-03-22 | 6 | -6/+6 |
| | | | |||||
| | * | prevent re-registrations using a deleted username - not an issue with ↵ | friendica | 2012-03-22 | 6 | -2/+38 |
| | | | | | | | | | Friendica but could create a serious privacy issue with federated platforms | ||||
| | * | Merge pull request #156 from tomtom84/master | tomtom84 | 2012-03-21 | 6 | -0/+10 |
| | |\ | | | | | | | fixes in diabook-derivates | ||||
| | | * | add file_as-option to diabook-derivates | tommy tomson | 2012-03-22 | 6 | -0/+10 |
| | |/ | |||||
| | * | support lowercase :-p smilie | friendica | 2012-03-21 | 1 | -0/+2 |
| | | | |||||
| | * | Merge branch 'pull' | friendica | 2012-03-21 | 14 | -46/+65 |
| | |\ | |||||
| | | * | Merge pull request #155 from tomtom84/master | tomtom84 | 2012-03-21 | 14 | -46/+65 |
| | | |\ | | | | | | | | | fixes in diabook-derivates | ||||
| | | | * | add icons to aside diabook, fixes in css | tommy tomson | 2012-03-22 | 14 | -46/+65 |
| | | |/ | |||||
| | * / | work around doubled linefeeds in tinymce3.5b2 | friendica | 2012-03-21 | 1 | -0/+10 |
| | |/ | |||||
| | * | revert permissions relaxation on community | friendica | 2012-03-21 | 1 | -2/+2 |
| | | | |||||
| | * | add comix-plain | friendica | 2012-03-21 | 7 | -1/+415 |
| | | | |||||
| | * | smooth the comix comment box | friendica | 2012-03-21 | 2 | -2/+36 |
| | | | |||||
| | * | make autocomplete work with updated tinymce | friendica | 2012-03-21 | 1 | -10/+10 |
| | | | |||||
| | * | ika to ica | friendica | 2012-03-21 | 1 | -1/+1 |
| | | | |||||
| | * | private file in repository | friendica | 2012-03-21 | 1 | -0/+0 |
| | | | |||||
| | * | facepark is unsupported ATM | friendica | 2012-03-21 | 2 | -0/+0 |
| | | | |||||
| | * | Merge branch 'pull' | friendica | 2012-03-20 | 25 | -0/+3661 |
| | |\ | |||||
| | | * | Merge pull request #154 from tonybaldwin/master | friendica | 2012-03-20 | 25 | -0/+3661 |
| | | |\ | | | | | | | | | added theme | ||||
| | | | * | Merge remote branch 'upstream/master' | tony baldwin | 2012-03-21 | 426 | -11330/+19994 |
| | | | |\ | |||||
| | | | * | | added Vijay's theme from facepark.in | tony baldwin | 2012-03-21 | 25 | -0/+3661 |
| | | | | | | |||||
| | * | | | | remove stray template variable from old code | friendica | 2012-03-20 | 2 | -3/+1 |
| | |/ / / | |||||
| | * | | | add comix theme | friendica | 2012-03-20 | 5 | -0/+386 |
| | | | | | |||||
| | * | | | use password field for DB input | friendica | 2012-03-20 | 1 | -1/+1 |
| | | |/ | |/| | |||||
| | * | | added README to mcefixes to explain what is going on. | friendica | 2012-03-20 | 1 | -0/+4 |
| | | | | |||||
| | * | | update tinymce to 3.5b2 to fix issues with FF 11 and pasting into code blocks | friendica | 2012-03-20 | 296 | -10368/+17048 |
| | | | | |||||
| | * | | more friend suggestions | friendica | 2012-03-20 | 1 | -1/+1 |
| | | | | |||||
| | * | | move friend suggestions to top of contact page, add default contact profile ↵ | friendica | 2012-03-20 | 2 | -2/+23 |
| | | | | | | | | | | | | | photos if missing | ||||
| | * | | Merge branch 'pull' | friendica | 2012-03-20 | 3 | -13/+148 |
| | |\ \ | |||||
| | | * \ | Merge pull request #153 from simonlnu/master | Simon | 2012-03-20 | 3 | -13/+148 |
| | | |\ \ | | | | | | | | | | | intro boxen tweaks, dispy gets synced with -dark | ||||
| | | | * | | some tweakings for intro boxes (finally got an intro i could see :). dispy ↵ | Simon L'nu | 2012-03-20 | 3 | -13/+148 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | synced with dispy-dark Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-20 | 1 | -4/+5 |
| | | | |\ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: bug #339 - lostpass sending to username, not email * master: | ||||
| | | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-20 | 6 | -103/+98 |
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: add IP address to failed login log message modified: include/text.php Stupid bug fixed cleanup after openid refactoring refactor openid logins/registrations modified: include/text.php deleted: images/diaspora.png deleted: images/smiley-bangheaddesk.gif deleted: images/smiley-beard.png deleted: images/smiley-shaka.gif deleted: images/smiley-whitebeard.png some openid fixes, use identity url from openid server and normalise it. support "no_smilies" ctrl + left|right cursor keys to prev/next photos add 'loggin_out' hook * master: | ||||
| | | | * \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-19 | 10 | -30/+66 |
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: Existing photos could not be used as profile photos anymore - should be fixed now. And some extra logging in the CSRF-Protection to make debugging easier community discovery cont., cleanup of DB debugging * master: | ||||
| | | | * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-18 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: revup CSRF-Protection in the group-related form (creating, renaming and dropping a group, adding/removing members from it) * master: | ||||
| | * | | | | | | 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 ↵ | friendica | 2012-03-20 | 9 | -10/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | brown square | ||||
| | * | | | | | | slightly relax overly strict permissions in community and search to match ↵ | friendica | 2012-03-20 | 3 | -9/+12 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | those in display - tl;dr public conversations are publicly visible | ||||
| | * | | / / | 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 ↵ | friendica | 2012-03-19 | 1 | -24/+2 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | beardy-unixer/84f8e2eaa87c90473ce79ebcd4f76f3657258f27 Smiley removal | ||||
| | | * | | | | modified: include/text.php | Thomas | 2012-03-19 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Stupid bug fixed | ||||
| | | * | | | | modified: include/text.php | Thomas | 2012-03-19 | 1 | -21/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deleted: images/diaspora.png deleted: images/smiley-bangheaddesk.gif deleted: images/smiley-beard.png deleted: images/smiley-shaka.gif deleted: images/smiley-whitebeard.png Removed selected smiley per Mike's request. Also removed deprecated smileys that were just commented out. | ||||
| | | * | | | | 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 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add "logging_out" hook | ||||
| | | * \ \ \ \ \ \ | 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 |
| | | |_|_|_|/ / / / | |/| | | | | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |