aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | bug fix in diabook-aerith and -redtommy tomson2012-03-316-22/+22
| | | |
| * | | Merge pull request #191 from tomtom84/mastertomtom842012-03-3117-40/+249
| |\ \ \ | | |/ / | |/| | bug-fixes in diabook-derivates
| | * | bug-fixes in diabook-derivatestommy tomson2012-03-3117-40/+249
| |/ /
| * | Merge pull request #190 from simonlnu/masterSimon2012-03-312-14/+2
| |\ \ | | | | | | | | forgot the css changes for last push
| | * | forgot the css changes for last pushSimon L'nu2012-03-312-14/+2
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | | Merge pull request #189 from simonlnu/masterSimon2012-03-314-44/+86
| |\| | | | | | | | | | most notable one is fixing qcomment
| | * | theme fixes; fix qcomment (finally)Simon L'nu2012-03-314-44/+86
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-312-9/+7
| | |\ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | * remotes/upstream/master: warning cleanup * master:
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-3032-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'nu2012-03-300-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 acceptancefriendica2012-03-315-18/+45
|/ / / /
* | / / warning cleanupfriendica2012-03-302-9/+7
| |/ / |/| |
* | | Merge branch 'pull'friendica2012-03-3031-265/+398
|\ \ \
| * \ \ Merge pull request #188 from fabrixxm/masterfriendica2012-03-3022-218/+328
| |\ \ \ | | | | | | | | | | Display settings tab and theme settings code
| | * | | quattro: move quattro-green inside quattro folder.Fabio Comuni2012-03-3016-72/+87
| | | | | | | | | | | | | | | | | | | | Add config option to select quattro color scheme.
| | * | | allow themes to use "style.php" instead of "style.css".Fabio Comuni2012-03-302-5/+26
| | | | | | | | | | | | | | | | | | | | Load style.php trhu mod/view.php to pass it friendica framework.
| | * | | Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-03-306-14/+36
| | |\ \ \ | | |/ / / | |/| | |
| * | | | css-fixes in diabook-derivatestommy tomson2012-03-306-14/+36
| | | | |
| | * | | quattro-green: remove settings codeFabio Comuni2012-03-301-29/+0
| | | | | | | | | | | | | | | | | | | | Use config.php from quattro
| | * | | quattro: add config.phpFabio Comuni2012-03-303-35/+35
| | | | |
| | * | | settings: add "display settings" tab, with UI-related settings.Fabio Comuni2012-03-303-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-derivatestommy tomson2012-03-308-32/+29
| | | |
| * | | catch OpenID login errors in cases when the OpenID server does not answersTobias Diekershoff2012-03-301-1/+5
| | | |
* | | | don't delete contact from a friend request if friendship was already establishedfriendica2012-03-302-2/+6
|/ / /
* | | css-fixes in diabook-derivatestommy tomson2012-03-306-9/+19
| | |
* | | quattro-green: added Description to the theme.phpTobias Diekershoff2012-03-301-0/+1
|/ /
* | quattro-green: adopted quattro option for centered displayTobias Diekershoff2012-03-302-1/+56
| |
* | Merge branch 'pull'friendica2012-03-30170-6/+18107
|\ \
| * \ Merge pull request #187 from tomtom84/mastertomtom842012-03-30170-6/+18107
| |\ \ | | | | | | | | add themes diabook-red & diabook-aerith
| | * | add themes diabook-red & diabook-aerithtommy tomson2012-03-30170-6/+18107
| |/ /
* / / string updatefriendica2012-03-301-964/+1230
|/ /
* | rename "file as" to "save to folder"friendica2012-03-303-4/+4
| |
* | Merge branch 'pull'friendica2012-03-302-29/+128
|\ \
| * \ Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-03-304-5/+5
| |\ \
| * | | quattro-greey: apply theming to private mailTobias Diekershoff2012-03-302-29/+128
| | | |
* | | | bug #352 - qcomment plugin disabled, qcomments still allowedfriendica2012-03-301-2/+5
| |/ / |/| |
* | | zrl into people searchesfriendica2012-03-294-5/+5
|/ /
* | another silly mistakefriendica2012-03-292-5/+5
| |
* | silly mistakefriendica2012-03-291-2/+3
| |
* | zrl on mentionsfriendica2012-03-291-0/+6
| |
* | use zrl to get home againfriendica2012-03-297-17/+54
| |
* | Merge branch 'pull'friendica2012-03-296-58/+44
|\ \
| * \ Merge pull request #186 from simonlnu/masterSimon2012-03-296-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'nu2012-03-296-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'nu2012-03-292-4/+3
| | |\ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | * remotes/upstream/master: typo in function name * master:
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-2931-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'nu2012-03-290-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 ↵friendica2012-03-291-1/+5
|/ / / / | | | | | | | | | | | | admin email address
* | / / typo in function namefriendica2012-03-292-4/+3
| |/ / |/| |
| | * modified: mod/newmember.phpThomas Willingham2012-04-021-0/+2
| | | | | | | | | | | | Add a link to the quick start
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-13 15:31:36 +0000