| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote branch 'upstream/master' | zottel | 2012-03-31 | 197 | -1141/+19714 |
| |\ | |||||
| | * | Merge branch 'pull' | friendica | 2012-03-30 | 31 | -265/+398 |
| | |\ | |||||
| | | * | Merge pull request #188 from fabrixxm/master | friendica | 2012-03-30 | 22 | -218/+328 |
| | | |\ | | | | | | | | | Display settings tab and theme settings code | ||||
| | | | * | quattro: move quattro-green inside quattro folder. | Fabio Comuni | 2012-03-30 | 16 | -72/+87 |
| | | | | | | | | | | | | | | | | | Add config option to select quattro color scheme. | ||||
| | | | * | allow themes to use "style.php" instead of "style.css". | Fabio Comuni | 2012-03-30 | 2 | -5/+26 |
| | | | | | | | | | | | | | | | | | Load style.php trhu mod/view.php to pass it friendica framework. | ||||
| | | | * | Merge remote-tracking branch 'friendica/master' | Fabio Comuni | 2012-03-30 | 6 | -14/+36 |
| | | | |\ | | | |/ | | |/| | |||||
| | | * | | css-fixes in diabook-derivates | tommy tomson | 2012-03-30 | 6 | -14/+36 |
| | | | | | |||||
| | | | * | quattro-green: remove settings code | Fabio Comuni | 2012-03-30 | 1 | -29/+0 |
| | | | | | | | | | | | | | | | | | Use config.php from quattro | ||||
| | | | * | quattro: add config.php | Fabio Comuni | 2012-03-30 | 3 | -35/+35 |
| | | | | | |||||
| | | | * | settings: add "display settings" tab, with UI-related settings. | Fabio Comuni | 2012-03-30 | 3 | -77/+180 |
| | | |/ | | | | | | | | | | | | | Load optional "config.php" from theme folder and show in page. Loading of "config.php" follow theme_info['extends'] property. | ||||
| | | * | css-fixes in diabook-derivates | tommy tomson | 2012-03-30 | 8 | -32/+29 |
| | | | | |||||
| | | * | catch OpenID login errors in cases when the OpenID server does not answers | Tobias Diekershoff | 2012-03-30 | 1 | -1/+5 |
| | | | | |||||
| | * | | don't delete contact from a friend request if friendship was already established | friendica | 2012-03-30 | 2 | -2/+6 |
| | |/ | |||||
| | * | css-fixes in diabook-derivates | tommy tomson | 2012-03-30 | 6 | -9/+19 |
| | | | |||||
| | * | quattro-green: added Description to the theme.php | Tobias Diekershoff | 2012-03-30 | 1 | -0/+1 |
| | | | |||||
| | * | quattro-green: adopted quattro option for centered display | Tobias Diekershoff | 2012-03-30 | 2 | -1/+56 |
| | | | |||||
| | * | Merge branch 'pull' | friendica | 2012-03-30 | 170 | -6/+18107 |
| | |\ | |||||
| | | * | Merge pull request #187 from tomtom84/master | tomtom84 | 2012-03-30 | 170 | -6/+18107 |
| | | |\ | | | | | | | | | add themes diabook-red & diabook-aerith | ||||
| | | | * | add themes diabook-red & diabook-aerith | tommy tomson | 2012-03-30 | 170 | -6/+18107 |
| | | |/ | |||||
| | * / | string update | friendica | 2012-03-30 | 1 | -964/+1230 |
| | |/ | |||||
| | * | rename "file as" to "save to folder" | friendica | 2012-03-30 | 3 | -4/+4 |
| | | | |||||
| | * | Merge branch 'pull' | friendica | 2012-03-30 | 2 | -29/+128 |
| | |\ | |||||
| | * | | bug #352 - qcomment plugin disabled, qcomments still allowed | friendica | 2012-03-30 | 1 | -2/+5 |
| | | | | |||||
| * | | | Merge remote branch 'upstream/master' | zottel | 2012-03-30 | 39 | -139/+391 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-03-30 | 4 | -5/+5 |
| | |\| | |||||
| | | * | zrl into people searches | friendica | 2012-03-29 | 4 | -5/+5 |
| | | | | |||||
| | * | | quattro-greey: apply theming to private mail | Tobias Diekershoff | 2012-03-30 | 2 | -29/+128 |
| | |/ | |||||
| | * | another silly mistake | friendica | 2012-03-29 | 2 | -5/+5 |
| | | | |||||
| | * | silly mistake | friendica | 2012-03-29 | 1 | -2/+3 |
| | | | |||||
| | * | zrl on mentions | friendica | 2012-03-29 | 1 | -0/+6 |
| | | | |||||
| | * | use zrl to get home again | friendica | 2012-03-29 | 7 | -17/+54 |
| | | | |||||
| | * | Merge branch 'pull' | friendica | 2012-03-29 | 6 | -58/+44 |
| | |\ | |||||
| | | * | Merge pull request #186 from simonlnu/master | Simon | 2012-03-29 | 6 | -58/+44 |
| | | |\ | | | | | | | | | tweaking stuff in dispys. i thought i fixed the login screens, but they're b0rked right now. | ||||
| | | | * | tweaking stuff in dispys. i thought i fixed the login screens, but they're ↵ | Simon L'nu | 2012-03-29 | 6 | -58/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | b0rked right now. Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-29 | 2 | -4/+3 |
| | | | |\ | | | |/ | | |/| | | | | | | | | | | | | | | | | | * remotes/upstream/master: typo in function name * master: | ||||
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-29 | 31 | -135/+657 |
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: theme file_as combobox for 2.0 css fixes in diabook-derivates quattro: style pm pages message: remove tabs, move new message link to aside, all message with gmail-style quattro: tpl for "file as" * master: | ||||
| | | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-29 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: some reported warnings cleaned up network permission ids wrong var for notify total fix notification total improved rw notifications bug #349 - email notls setting add a searchbox to "find friends" for global search bugfix in diabook title not updated when editing post New parameter in html2plain for plain text exports. More compatibility in API API: added max_id API: Now threading seems to work API: Seesmic is now working. Optimizing text export. Quotes with author are now having an "open/close" link New bbcode element: "spoiler". Mail: Top post quotes are now embraced in "spoiler" elements * master: | ||||
| | * | | | | provide a way to specify an admin account for siteinfo if more than one have ↵ | friendica | 2012-03-29 | 1 | -1/+5 |
| | |/ / / | | | | | | | | | | | | | admin email address | ||||
| | * | / | typo in function name | friendica | 2012-03-29 | 2 | -4/+3 |
| | | |/ | |/| | |||||
| | * | | theme file_as combobox for 2.0 | friendica | 2012-03-29 | 2 | -1/+8 |
| | | | | |||||
| | * | | css fixes in diabook-derivates | tommy tomson | 2012-03-29 | 16 | -23/+136 |
| | | | | |||||
| * | | | Merge remote branch 'upstream/master' | zottel | 2012-03-29 | 87 | -435/+2071 |
| |\| | | |||||
| | * | | Merge pull request #185 from fabrixxm/master | fabrixxm | 2012-03-28 | 13 | -111/+513 |
| | |\ \ | | |/ | |/| | Updated private message pages | ||||
| | | * | quattro: style pm pages | Fabio Comuni | 2012-03-28 | 8 | -64/+405 |
| | | | | |||||
| | | * | message: remove tabs, move new message link to aside, all message with ↵ | Fabio Comuni | 2012-03-28 | 4 | -47/+96 |
| | | | | | | | | | | | | | gmail-style | ||||
| | | * | Merge remote-tracking branch 'friendica/master' | Fabio Comuni | 2012-03-28 | 22 | -130/+316 |
| | | |\ | |||||
| | | * | | quattro: tpl for "file as" | Fabio Comuni | 2012-03-28 | 1 | -0/+12 |
| | | | | | |||||
| | * | | | some reported warnings cleaned up | friendica | 2012-03-28 | 3 | -8/+11 |
| | | | | | |||||
| | * | | | Merge branch 'pull' | friendica | 2012-03-28 | 10 | -78/+317 |
| | |\ \ \ | |||||
| | | * \ \ | Merge pull request #184 from annando/master | friendica | 2012-03-28 | 10 | -78/+317 |
| | | |\ \ \ | | | | | | | | | | | | | Enhancing the API - Preparations for a better facebook export | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |