aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #51 from simonlnu/masterSimon2012-02-262-3/+2
|\ | | | | RFC, request for comments: about the https for html5shiv
| * minor typographical fixes. need to do something about the http on https ↵Simon L'nu2012-02-272-3/+2
| | | | | | | | | | | | sites for html5shiv. changed to https on mine Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-02-270-0/+0
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: (29 commits) spam db fix tag icon size typo in css tagging missing from wallwall and a couple of themes, star missing from dispy Mail: New options for actions after importing mails. relative link redirects Avoid some notices Bugfix is not always defined; but if defined, then always of type integer 1 Bugfix (missing $ character) and avoid some notices necessare fields not loaded from DB should probably be a->user['hidewall'] instead of profile['hidewall'] "Vier-Theme" Some more design stuff. some revision to the German strings German strings Wrong variable name show experimental and unsupported theme status on theme admin page jumping divs with no scrolling imrpove contrast on darkzero blockquotes darkzero-NS theme ... * master:
* spam dbfriendica2012-02-263-2/+29
|
* fix tag icon sizefriendica2012-02-261-0/+0
|
* typo in cssfriendica2012-02-261-1/+1
|
* tagging missing from wallwall and a couple of themes, star missing from dispyfriendica2012-02-2613-2/+37
|
* Merge pull request #50 from annando/masterfriendica2012-02-2621-474/+1238
|\ | | | | massive changes in mail and design updates in "vier"
| * Mail: New options for actions after importing mails.Michael2012-02-267-41/+84
| |
| * Merge remote branch 'upstream/master'Michael2012-02-2648-1659/+3227
| |\
| * | "Vier-Theme" Some more design stuff.Michael2012-02-264-336/+315
| | |
| * | poller.php: Test for moving to archive, vier-style: notifications fixedMichael2012-02-252-4/+33
| | |
| * | "vier" popup menu looks nicer now (more like quattro again)Michael2012-02-251-6/+14
| | |
| * | "vier": The contacts are now working again. Line break before closing ↵Michael2012-02-255-22/+289
| | | | | | | | | | | | bbcodes removed.
| * | Bug fixed where mails where nearly empty. HTML mails can now be received.Michael2012-02-251-62/+78
| | |
| * | multipart messages complete, message-id conversion done.Michael2012-02-254-20/+29
| | |
| * | Sending mail as multipart/alternative (html and plain text) (very basic by now)Michael2012-02-243-27/+51
| | |
| * | Encoding for incoming mails. Fixed invalid message id (with side effect at ↵Michael2012-02-247-23/+411
| | | | | | | | | | | | the moment). Sending mail as text mail. Encoding name when importing mail contact.
| * | GIT problems ...Michael2012-02-231-8/+1
| | |
| * | Merge remote branch 'upstream/master'Michael2012-02-2367-286/+871
| |\ \ | | | | | | | | | | | | | | | | Conflicts: include/bbcode.php
| * | | bbcode.php: A list or quote at the beginning wasn't detectedMichael2012-02-231-3/+3
| | | |
* | | | Merge pull request #49 from CatoTH/masterfriendica2012-02-2610-23/+29
|\ \ \ \ | | | | | | | | | | Bugfix for del_config
| * | | | Avoid some noticesTobias Hößl2012-02-263-11/+12
| | | | |
| * | | | BugfixTobias Hößl2012-02-261-1/+1
| | | | |
| * | | | is not always defined; but if defined, then always of type integerTobias Hößl2012-02-261-1/+1
| | | | |
| * | | | 1 Bugfix (missing $ character) and avoid some noticesTobias Hößl2012-02-261-3/+3
| | | | |
| * | | | necessare fields not loaded from DBTobias Hößl2012-02-262-3/+6
| | | | |
| * | | | should probably be a->user['hidewall'] instead of profile['hidewall']Tobias Hößl2012-02-261-3/+5
| | | | |
| * | | | Wrong variable nameroot2012-02-261-1/+1
| | | | |
* | | | | Merge branch 'pull'friendica2012-02-262-645/+912
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | some revision to the German stringsTobias Diekershoff2012-02-262-18/+20
| | | | |
| * | | | German stringsTobias Diekershoff2012-02-262-630/+895
| | | | |
* | | | | relative link redirectsfriendica2012-02-263-13/+25
|/ / / /
* / / / show experimental and unsupported theme status on theme admin pagefriendica2012-02-2611-3/+14
|/ / /
* | | jumping divs with no scrollingfriendica2012-02-261-1/+1
| | |
* | | imrpove contrast on darkzero blockquotesfriendica2012-02-262-0/+8
| | |
* | | darkzero-NS themefriendica2012-02-267-1/+153
| | |
* | | Merge pull request #48 from abinoam/thmail-5Simon2012-02-256-13/+101
|\ \ \ | | | | | | | | Comment Notifications by Email - Threading Them
| * | | Comment notifications by e-mail now are threadedAbinoam P. Marques Jr2012-02-251-6/+50
| | | |
| * | | include/items.php pass 'parent' to notificationAbinoam P. Marques Jr2012-02-251-3/+7
| | | |
| * | | mod/item.php pass 'parent' to notificationAbinoam P. Marques Jr2012-02-251-1/+2
| | | |
| * | | DB_UPDATE_VERSION incrementedAbinoam P. Marques Jr2012-02-251-1/+1
| | | |
| * | | Added notify-threads to update.phpAbinoam P. Marques Jr2012-02-251-2/+15
| | | |
| * | | Added notify-threads to database.sql.Abinoam P. Marques Jr2012-02-251-0/+26
| | | |
* | | | one more attemptfriendica2012-02-251-2/+2
| | | |
* | | | missed a spotfriendica2012-02-251-1/+1
| | | |
* | | | reverse order of linksfriendica2012-02-251-1/+1
| | | |
* | | | do not set notify popup empty anymore (though another solution is needed for ↵friendica2012-02-251-2/+2
|/ / / | | | | | | | | | firehose mode)
* | | scale external imagesfriendica2012-02-254-37/+49
| | |
* | | fixed link for toggling plugin from detail pagefriendica2012-02-253-3/+3
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 14:12:10 +0000