aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* waitman gobble fix for escaping code blocks in tinymcefriendica2012-02-241-8/+65
* attribution issue - don't take author name from contact if available from item.friendica2012-02-244-17/+27
* more privacy docsfriendica2012-02-242-1/+18
* theme shakeup commences - themes are now administered in admin panel.friendica2012-02-239-13/+215
* system notifications to notify module, untranslated string in notifications.tplfriendica2012-02-233-5/+37
* implement firehose notify in ping, strip links so notify popup displays corre...friendica2012-02-232-140/+115
* Merge pull request #47 from fabrixxm/masterSimon2012-02-232-4/+5
|\
| * Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-02-231-21/+0
| |\ | |/ |/|
* | quattro-green: removed contact_template.tplTobias Diekershoff2012-02-231-21/+0
| * Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-02-233-23/+43
| |\ | |/ |/|
* | green-quattro: applied a color for shiny class and previewTobias Diekershoff2012-02-232-22/+42
* | Merge pull request #46 from fabrixxm/masterfabrixxm2012-02-2315-134/+273
|\ \
* | | fix img tag with size attributeTobias Diekershoff2012-02-231-1/+1
| | * quattro: fix typosFabio Comuni2012-02-232-4/+5
| |/
| * quattro post preview, style contacts pages, style for "shiny" class, fix cont...Fabio Comuni2012-02-2315-134/+273
|/
* Merge branch 'master' into notifyfriendica2012-02-235-5/+155
|\
| * Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-02-232-5/+2
| |\
| | * README file shortened because this was for my branch only.Michael Vogel2012-02-231-3/+0
| | * Removed the export of markdown articles. That was for testing purposes only.Michael Vogel2012-02-231-2/+2
| * | quattro: added styling to pivate message viewTobias Diekershoff2012-02-233-0/+153
| |/
* | more theme notify fixesfriendica2012-02-232-1/+2
* | new notify sort of working in testbubblefriendica2012-02-226-3/+52
* | Merge branch 'master' into notifyfriendica2012-02-2223-704/+1377
|\|
| * nested quote check fails to account for strpos returning position 0friendica2012-02-221-2/+2
| * restore poller normal operationfriendica2012-02-221-2/+2
| * Merge pull request #45 from annando/masterfriendica2012-02-2216-689/+1257
| |\
| | * German translation more gender friendly. Some more logging in poller.phpMichael2012-02-227-11/+26
| | * Fetched some missing styles from testbubble.Michael2012-02-202-0/+395
| | * Some testing stuffMichael2012-02-202-1/+2
| | * API is now working on my nginx server.Michael2012-02-203-12/+24
| | * New version of markdown. Playing with stylesheet. Testing line breaks.root2012-02-193-504/+404
| | * Handling nested bbcodes. Some small design changes in html2bbcode. Change in ...Michael2012-02-193-23/+35
| | * README addedMichael2012-02-191-0/+3
| | * Brand new html2bbcode. Some other changes in diaspora to bbcode handlingMichael2012-02-193-158/+322
| | * Many small changesMichael2012-02-191-23/+0
| | * Merge remote branch 'upstream/master'Michael2012-02-19161-7793/+23085
| | |\
| | * | New theme "vier" derives from "quattro"ike2012-02-1911-0/+4270
| * | | Merge branch 'pull'friendica2012-02-221-1/+1
| |\ \ \
| | * \ \ Merge pull request #44 from simonlnu/masterfriendica2012-02-221-1/+1
| | |\ \ \
| | | * | | clean up Groups help file. there was a stray 'Freindika' in itSimon L'nu2012-02-221-1/+1
| | |/ / /
| * | | | allow forum posts by followers on Diasporafriendica2012-02-222-8/+20
| * | | | never enough documentationfriendica2012-02-221-0/+9
| |/ / /
| * | | waitman gobble media upload via api patchfriendica2012-02-212-5/+61
| * | | escape smiley conversion in code and pre blocksfriendica2012-02-211-0/+17
| * | | mark all notifications readfriendica2012-02-213-3/+14
* | | | some cleanup of tb notificationsfriendica2012-02-212-1/+6
* | | | new notificationsfriendica2012-02-211-0/+25
* | | | add full email link to notificationfriendica2012-02-211-3/+3
|/ / /
* | | Merge branch 'pull'friendica2012-02-211-2/+26
|\ \ \
| * \ \ Merge pull request #43 from fabrixxm/masterfabrixxm2012-02-211-2/+26
| |\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 04:28:12 +0000