aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'upstream/master'Michael2012-02-283-7/+9
|\
| * Merge pull request #53 from fabrixxm/masterfabrixxm2012-02-273-7/+9
| |\
| | * revert 01a2791e3a to avoid random preg internal errors. fix contact_templateFabio Comuni2012-02-273-7/+9
| |/
* | Merge remote branch 'upstream/master'Michael2012-02-2722-55/+154
|\|
| * Merge pull request #52 from campino/masterSimon2012-02-271-3/+3
| |\
| | * fixed syntax errorsAlexander Kampmann2012-02-271-3/+3
| * | add plugin hooks to enotifyfriendica2012-02-264-45/+83
| * | Merge pull request #51 from simonlnu/masterSimon2012-02-262-3/+2
| |\ \
| | * | minor typographical fixes. need to do something about the http on https sites...Simon L'nu2012-02-272-3/+2
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-02-270-0/+0
| |/ /
| * | 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
| |\ \
* | | | Merge remote branch 'upstream/master'Michael2012-02-2713-36/+54
|\| | | | |/ / |/| |
| * | Merge pull request #49 from CatoTH/masterfriendica2012-02-2610-23/+29
| |\ \
| | * | 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
| |\ \ \
| * | | | relative link redirectsfriendica2012-02-263-13/+25
* | | | | Mail: New options for actions after importing mails.Michael2012-02-267-41/+84
* | | | | Merge remote branch 'upstream/master'Michael2012-02-2648-1659/+3227
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | some revision to the German stringsTobias Diekershoff2012-02-262-18/+20
| * | | | German stringsTobias Diekershoff2012-02-262-630/+895
| |/ / /
| * / / 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 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
| |/ /
| * / scale external imagesfriendica2012-02-254-37/+49
| |/
| * fixed link for toggling plugin from detail pagefriendica2012-02-253-3/+3
| * notify positioning, themingfriendica2012-02-252-7/+5
| * sysnotify count in wrong location, and wrong numberfriendica2012-02-252-3/+11
| * theme seen,unseen notificationsfriendica2012-02-254-16/+20
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 00:34:11 +0000