| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-02 | 2 | -2/+33 |
| |\ | | | | | | | | | | | | | * remotes/upstream/master: bug #363 and a couple of other reported ssl link issues * master: | ||||
| | * | bug #363 and a couple of other reported ssl link issues | friendica | 2012-04-02 | 2 | -2/+33 |
| | | | |||||
| * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-02 | 35 | -217/+378 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: diabook-themes: css-fixes diabook-themes: fixes in js diabook-themes: fixed pageheader diabook-themes: bugfixes / css-fixes make the "new calendar" (javascript interactive) the default remove zrl from query string catch a couple more Oo smilies add page_content_top hook * master: | ||||
| | * | diabook-themes: css-fixes | tommy tomson | 2012-04-02 | 24 | -20/+125 |
| | | | |||||
| | * | diabook-themes: fixes in js | tommy tomson | 2012-04-02 | 4 | -112/+115 |
| | | | |||||
| | * | diabook-themes: fixed pageheader | tommy tomson | 2012-04-02 | 17 | -68/+98 |
| | | | |||||
| | * | diabook-themes: bugfixes / css-fixes | tommy tomson | 2012-04-02 | 17 | -17/+30 |
| | | | |||||
| | * | make the "new calendar" (javascript interactive) the default | friendica | 2012-04-02 | 1 | -4/+4 |
| | | | |||||
| | * | remove zrl from query string | friendica | 2012-04-02 | 2 | -0/+4 |
| | | | |||||
| | * | catch a couple more Oo smilies | friendica | 2012-04-01 | 1 | -0/+4 |
| | | | |||||
| | * | add page_content_top hook | friendica | 2012-04-01 | 1 | -0/+2 |
| | | | |||||
| * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-01 | 34 | -35/+340 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: add title to D* posts allow users to set categories on their posts Modified peopleyouknow to handle sites without Facebook better diabook-themes: add link to global dir in "find friends" at right_aside modified: mod/newmember.php New user quick start. check for style.php existence before inclusion Moved Diaspora notes away from top, per user request * master: | ||||
| | * | add title to D* posts | friendica | 2012-04-01 | 1 | -1/+5 |
| | | | |||||
| | * | Merge pull request #200 from unary/categories | friendica | 2012-04-01 | 11 | -18/+226 |
| | |\ | | | | | | | allow users to set categories on their posts | ||||
| | | * | allow users to set categories on their posts | Michael Johnston | 2012-04-01 | 11 | -18/+226 |
| | |/ | |||||
| | * | Merge pull request #199 from ↵ | friendica | 2012-04-01 | 1 | -2/+4 |
| | |\ | | | | | | | | | | | | | beardy-unixer/1457d6e90f36a6a7bb07df3579b6e5c0475b121d Better peopleyouknow for sites without Facebook | ||||
| | | * | Modified peopleyouknow to handle sites without Facebook better | Thomas Willingham | 2012-04-02 | 1 | -2/+4 |
| | | | | |||||
| | * | | Merge pull request #198 from beardy-unixer/master | friendica | 2012-04-01 | 9 | -3/+85 |
| | |\| | | | | | | | New User Quick Start | ||||
| | | * | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2012-04-02 | 278 | -1440/+32270 |
| | | |\ | | |/ | |/| | |||||
| | * | | diabook-themes: add link to global dir in "find friends" at right_aside | tommy tomson | 2012-04-02 | 12 | -12/+20 |
| | | | | |||||
| | * | | check for style.php existence before inclusion | friendica | 2012-04-01 | 1 | -1/+2 |
| | | | | |||||
| | | * | modified: mod/newmember.php | Thomas Willingham | 2012-04-02 | 1 | -0/+2 |
| | | | | | | | | | | | | | Add a link to the quick start | ||||
| | | * | New user quick start. | Thomas Willingham | 2012-04-02 | 7 | -0/+80 |
| | | | | |||||
| | | * | Moved Diaspora notes away from top, per user request | Thomas Willingham | 2012-04-02 | 1 | -3/+3 |
| | | | | |||||
| * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-01 | 0 | -0/+0 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: slight improvement in handling of plaintext feeds css-fixes add new messages-layout in diabook fix the display of community-plugin in diabook-themes that didn't quite work out document tinymce fixes/workarounds various bugfixes and css-fixes qcomment overflow try slightly better detection of html in feeds send unverified private mail using zrl * master: | ||||
| * | | Merge branch 'pull' | friendica | 2012-04-01 | 37 | -236/+1125 |
| |\ \ | |||||
| | * | | css-fixes | tommy tomson | 2012-04-02 | 7 | -12/+13 |
| | | | | |||||
| | * | | Merge pull request #197 from tomtom84/master | tomtom84 | 2012-04-01 | 25 | -8/+683 |
| | |\ \ | | | | | | | | | fixes in diabook-derivates | ||||
| | | * | | add new messages-layout in diabook | tommy tomson | 2012-04-01 | 25 | -8/+683 |
| | |/ / | |||||
| | * | | Merge pull request #196 from tomtom84/master | tomtom84 | 2012-04-01 | 16 | -222/+435 |
| | |\ \ | | | | | | | | | fixes in diabook-derivates | ||||
| | | * | | fix the display of community-plugin in diabook-themes | tommy tomson | 2012-04-01 | 16 | -222/+435 |
| | |/ / | |||||
| * / / | slight improvement in handling of plaintext feeds | friendica | 2012-04-01 | 2 | -3/+10 |
| |/ / | |||||
| * | | that didn't quite work out | friendica | 2012-04-01 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'pull' | friendica | 2012-04-01 | 11 | -46/+69 |
| |\ \ | |||||
| | * \ | Merge pull request #195 from tomtom84/master | tomtom84 | 2012-04-01 | 11 | -46/+69 |
| | |\ \ | | | | | | | | | fixes in diabook-derivates | ||||
| | | * | | various bugfixes and css-fixes | tommy tomson | 2012-04-01 | 11 | -46/+69 |
| | |/ / | |||||
| * / / | document tinymce fixes/workarounds | friendica | 2012-04-01 | 1 | -1/+5 |
| |/ / | |||||
| * | | qcomment overflow | friendica | 2012-04-01 | 1 | -0/+8 |
| | | | |||||
| * | | try slightly better detection of html in feeds | friendica | 2012-04-01 | 1 | -3/+4 |
| | | | |||||
| * | | Merge branch 'pull' | friendica | 2012-04-01 | 6 | -12/+32 |
| |\ \ | |||||
| | * \ | Merge pull request #194 from simonlnu/master | Simon | 2012-04-01 | 5 | -11/+31 |
| | |\ \ | | | | | | | | | latest fixes for dispys. tweaking/repairing | ||||
| | | * | | latest fixes for dispys. tweaking/repairing | Simon L'nu | 2012-04-01 | 5 | -11/+31 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-01 | 2 | -9/+6 |
| | | |\ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: line 86: s/Friendika/Friendica/ fix "between yourself and You" in mail list * master: | ||||
| | * | | | line 86: s/Friendika/Friendica/ | Simon | 2012-04-01 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-31 | 45 | -94/+10852 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: more error handling ensure all new users get a timezone. We'll use UTC until they choose otherwise. handle escaped file chars in display and search escape % in file_tag_query as it is ultimately embedded in a sprintf diabook-themes: move "common tabs" to left side on settings page move the common tabs to right_aside in diabook-derivates register hooks for a COPA plugin some js fixes - ignore backspace as history selector and cleanup errors closing non-existent menus bug fix in diabook-aerith and -red bug-fixes in diabook-derivates settings for unknown private mail acceptance * master: | ||||
| | | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-31 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: * master: | ||||
| * | | | | | send unverified private mail using zrl | friendica | 2012-04-01 | 10 | -6/+387 |
| |/ / / / | |||||
| * | / / | fix "between yourself and You" in mail list | friendica | 2012-03-31 | 1 | -8/+5 |
| | |/ / |/| | | |||||
| * | | | more error handling | friendica | 2012-03-31 | 2 | -1/+4 |
| | | | | |||||
| * | | | ensure all new users get a timezone. We'll use UTC until they choose otherwise. | friendica | 2012-03-31 | 2 | -2/+6 |
| | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |