aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #55 from fabrixxm/masterfabrixxm2012-03-0225-633/+731
|\
| * Merge remote-tracking branch 'friendica/master' into randomerrorFabio Comuni2012-03-018-35/+115
| |\
| * | conversation: remove templating items in code and move it to template.Fabio Comuni2012-03-0115-551/+584
| * | template proc: avoid a notice and allow template name to include to be passed...Fabio Comuni2012-03-011-1/+9
| * | show relation in contact_templateFabio Comuni2012-03-011-0/+1
| * | admin: fix small stringFabio Comuni2012-03-011-2/+5
| * | Merge remote-tracking branch 'friendica/master' into randomerrorFabio Comuni2012-02-2995-2292/+4726
| |\ \
| * | | fix visualization in groupeditorFabio Comuni2012-02-231-2/+2
| * | | less html in mod/group.php, template for group members editor, quattro theme ...Fabio Comuni2012-02-237-79/+132
* | | | Merge pull request #56 from tomtom84/masterfriendica2012-03-011-0/+0
|\ \ \ \
| * \ \ \ 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
| * | | | 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 bbcodes...Michael2012-02-255-22/+289
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 18:01:14 +0000