aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix editortommy tomson2012-03-032-14/+34
* fix text-editor in themetommy tomson2012-03-0310-7/+204
* small fix in style.csstommy tomson2012-03-031-1/+5
* fix star/unstartommy tomson2012-03-032-0/+0
* fixes in wall_item.tpl and style.css in theme diabooktommy tomson2012-03-033-8/+12
* fix in wall_item.tpltommy tomson2012-03-033-10/+13
* fixed broken tags and notifications in themetommy tomson2012-03-033-16/+26
* deleted readme.txt from folder diabooktommy tomson2012-03-021-0/+0
* github finally workingtommy tomson2012-03-021-2/+0
* adjust3tommy tomson2012-03-021-0/+1
* Merge remote-tracking branch 'tomtom84_friendica/master' into master-2tommy tomson2012-03-021-0/+1
|\
| * adjusttommy tomson2012-03-0224-0/+2332
* | adjust2tommy tomson2012-03-0223-0/+2331
|/
* Merge remote-tracking branch 'upstream/master'tommy tomson2012-03-028-4/+211
|\
| * Merge branch 'pull'friendica2012-03-016-3/+205
| |\
| | * Merge pull request #54 from campino/masterfriendica2012-03-016-3/+205
| | |\
| | | * Merge remote-tracking branch 'upstream/master'Alexander Kampmann2012-03-0184-1362/+2846
| | | |\ | | | |/ | | |/|
| | | * Enabled automated doc building. Changes:Alexander Kampmann2012-03-016-3/+205
| * | | probe for very old (0.97 or 1.0) RSS feed with an incorrect or generic conten...friendica2012-03-012-1/+6
| |/ /
* / / diabook committommy tomson2012-03-021-0/+0
|/ /
* | yet more work on notificationsfriendica2012-02-293-29/+54
* | notification enhancementsfriendica2012-02-295-7/+43
* | better handling of multiple notifications for same item, and old notificationsfriendica2012-02-293-5/+24
* | Update LICENSEfriendica2012-02-291-1/+1
* | Update READMEfriendica2012-02-291-0/+4
* | cleaned up mess created when both people request friendship and one approves ...friendica2012-02-281-1/+11
* | call time pass by reference deprecatedfriendica2012-02-281-1/+1
* | Merge branch 'pull'friendica2012-02-281-1/+2
|\ \
| * | fix url and network displayfabrixxm2012-02-281-1/+2
* | | From Tobias H - catch some irregularities caused by cut/paste codefriendica2012-02-284-7/+7
|/ /
* | update globaldir when page-type changes, add spam date fieldfriendica2012-02-275-55/+13
* | clicking contact on contacts page broken linkfriendica2012-02-271-0/+1
* | Merge branch 'pull'friendica2012-02-274-10/+12
|\ \
| * \ 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 pull request #52 from campino/masterSimon2012-02-271-3/+3
| |\|
| | * fixed syntax errorsAlexander Kampmann2012-02-271-3/+3
* | | cleanup notify subject linesfriendica2012-02-272-9/+18
|/ /
* | 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
|\ \
| * | 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