aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-012-9/+6
|\ | | | | | | | | | | | | | | * remotes/upstream/master: line 86: s/Friendika/Friendica/ fix "between yourself and You" in mail list * master:
| * line 86: s/Friendika/Friendica/Simon2012-04-011-1/+1
| |
| * fix "between yourself and You" in mail listfriendica2012-03-311-8/+5
| |
* | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-3145-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:
| * more error handlingfriendica2012-03-312-1/+4
| |
| * ensure all new users get a timezone. We'll use UTC until they choose otherwise.friendica2012-03-312-2/+6
| |
| * handle escaped file chars in display and searchfriendica2012-03-315-13/+10
| |
| * Merge branch 'pull'friendica2012-03-3112-0/+10498
| |\
| | * Merge pull request #193 from tomtom84/mastertomtom842012-03-3112-47/+31
| | |\ | | | | | | | | diabook-themes: move "common tabs" to left side on settings page
| | | * diabook-themes: move "common tabs" to left side on settings pagetommy tomson2012-03-3112-47/+31
| | |/
| | * Merge pull request #192 from tomtom84/mastertomtom842012-03-3112-0/+10514
| | |\ | | | | | | | | fixes in diabook-derivates
| | | * move the common tabs to right_aside in diabook-derivatestommy tomson2012-03-3112-0/+10514
| | |/
| * / escape % in file_tag_query as it is ultimately embedded in a sprintffriendica2012-03-312-1/+5
| |/
| * register hooks for a COPA pluginfriendica2012-03-311-0/+7
| |
| * some js fixes - ignore backspace as history selector and cleanup errors ↵friendica2012-03-311-4/+13
| | | | | | | | closing non-existent menus
| * Merge branch 'pull'friendica2012-03-3125-116/+355
| |\
| | * 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
| | |/
| * | settings for unknown private mail acceptancefriendica2012-03-315-18/+45
| | |
* | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-310-0/+0
| |/ |/| | | | | | | | | * remotes/upstream/master: * master:
* | 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:
* | warning cleanupfriendica2012-03-302-9/+7
| |
| * 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 '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
| |
| * 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:
* 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
|\