| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| | | | |||||
| | * | 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 |
| | | | | |||||
| | * | | handle escaped file chars in display and search | friendica | 2012-03-31 | 5 | -13/+10 |
| | | | | |||||
| | * | | Merge branch 'pull' | friendica | 2012-03-31 | 12 | -0/+10498 |
| | |\ \ | |||||
| | | * \ | Merge pull request #193 from tomtom84/master | tomtom84 | 2012-03-31 | 12 | -47/+31 |
| | | |\ \ | | | | | | | | | | | diabook-themes: move "common tabs" to left side on settings page | ||||
| | | | * | | diabook-themes: move "common tabs" to left side on settings page | tommy tomson | 2012-03-31 | 12 | -47/+31 |
| | | |/ / | |||||
| | | * | | Merge pull request #192 from tomtom84/master | tomtom84 | 2012-03-31 | 12 | -0/+10514 |
| | | |\ \ | | | | | | | | | | | fixes in diabook-derivates | ||||
| | | | * | | move the common tabs to right_aside in diabook-derivates | tommy tomson | 2012-03-31 | 12 | -0/+10514 |
| | | |/ / | |||||
| | * / / | escape % in file_tag_query as it is ultimately embedded in a sprintf | friendica | 2012-03-31 | 2 | -1/+5 |
| | |/ / | |||||
| | * | | register hooks for a COPA plugin | friendica | 2012-03-31 | 1 | -0/+7 |
| | | | | |||||
| | * | | some js fixes - ignore backspace as history selector and cleanup errors ↵ | friendica | 2012-03-31 | 1 | -4/+13 |
| | | | | | | | | | | | | | closing non-existent menus | ||||
| | * | | Merge branch 'pull' | friendica | 2012-03-31 | 25 | -116/+355 |
| | |\ \ | |||||
| | | * | | bug fix in diabook-aerith and -red | tommy tomson | 2012-03-31 | 6 | -22/+22 |
| | | | | | |||||
| | | * | | Merge pull request #191 from tomtom84/master | tomtom84 | 2012-03-31 | 17 | -40/+249 |
| | | |\ \ | | | |/ | | |/| | bug-fixes in diabook-derivates | ||||
| | | | * | bug-fixes in diabook-derivates | tommy tomson | 2012-03-31 | 17 | -40/+249 |
| | | |/ | |||||
| | | * | Merge pull request #190 from simonlnu/master | Simon | 2012-03-31 | 2 | -14/+2 |
| | | |\ | | | | | | | | | forgot the css changes for last push | ||||
| | | | * | forgot the css changes for last push | Simon L'nu | 2012-03-31 | 2 | -14/+2 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | * | | Merge pull request #189 from simonlnu/master | Simon | 2012-03-31 | 4 | -44/+86 |
| | | |\| | | | | | | | | | most notable one is fixing qcomment | ||||
| | | | * | theme fixes; fix qcomment (finally) | Simon L'nu | 2012-03-31 | 4 | -44/+86 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-31 | 2 | -9/+7 |
| | | | |\ | | | |/ | | |/| | | | | | | | | | | | | | | | | | * remotes/upstream/master: warning cleanup * master: | ||||
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-30 | 32 | -275/+423 |
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: don't delete contact from a friend request if friendship was already established quattro: move quattro-green inside quattro folder. Add config option to select quattro color scheme. allow themes to use "style.php" instead of "style.css". Load style.php trhu mod/view.php to pass it friendica framework. css-fixes in diabook-derivates css-fixes in diabook-derivates quattro-green: remove settings code Use config.php from quattro quattro: add config.php settings: add "display settings" tab, with UI-related settings. Load optional "config.php" from theme folder and show in page. Loading of "config.php" follow theme_info['extends'] property. catch OpenID login errors in cases when the OpenID server does not answers css-fixes in diabook-derivates quattro-green: added Description to the theme.php * master: | ||||
| | | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-30 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: quattro-green: adopted quattro option for centered display string update add themes diabook-red & diabook-aerith rename "file as" to "save to folder" bug #352 - qcomment plugin disabled, qcomments still allowed quattro-greey: apply theming to private mail zrl into people searches another silly mistake silly mistake zrl on mentions use zrl to get home again provide a way to specify an admin account for siteinfo if more than one have admin email address * master: | ||||
| | * | | | | settings for unknown private mail acceptance | friendica | 2012-03-31 | 5 | -18/+45 |
| | |/ / / | |||||
| | * | / | warning cleanup | friendica | 2012-03-30 | 2 | -9/+7 |
| | | |/ | |/| | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |