aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* photos in notificationsfriendica2012-02-251-1/+1
* theme info (like plugin info)friendica2012-02-254-5/+76
* notifications to zeros, bug in notify linkfriendica2012-02-243-3/+88
* string update for 2.38friendica2012-02-243-774/+1324
* update author name across items if changed.friendica2012-02-244-3/+24
* 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