aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* templates: fix tagsFabio Comuni2012-03-0210-20/+22
* Merge pull request #55 from fabrixxm/masterfabrixxm2012-03-0221-495/+575
|\
| * conversation: remove templating items in code and move it to template.Fabio Comuni2012-03-0114-457/+481
| * show relation in contact_templateFabio Comuni2012-03-011-0/+1
| * Merge remote-tracking branch 'friendica/master' into randomerrorFabio Comuni2012-02-2947-1008/+1831
| |\
| * | 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-236-38/+93
* | | diabook committommy tomson2012-03-021-0/+0
| |/ |/|
* | revert 01a2791e3a to avoid random preg internal errors. fix contact_templateFabio Comuni2012-02-271-2/+2
* | add plugin hooks to enotifyfriendica2012-02-263-3/+3
* | minor typographical fixes. need to do something about the http on https sites...Simon L'nu2012-02-272-3/+2
* | 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-2611-0/+24
* | Mail: New options for actions after importing mails.Michael2012-02-262-6/+9
* | Merge remote branch 'upstream/master'Michael2012-02-2624-650/+1174
|\ \
| * | 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-269-0/+2
| * | 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
| * | reverse order of linksfriendica2012-02-251-1/+1
| * | fixed link for toggling plugin from detail pagefriendica2012-02-251-1/+1
| * | notify positioning, themingfriendica2012-02-252-7/+5
| * | sysnotify count in wrong location, and wrong numberfriendica2012-02-251-1/+1
| * | theme seen,unseen notificationsfriendica2012-02-252-1/+5
| * | photos in notificationsfriendica2012-02-251-1/+1
| * | theme info (like plugin info)friendica2012-02-251-0/+7
| * | notifications to zeros, bug in notify linkfriendica2012-02-242-0/+85
| * | theme shakeup commences - themes are now administered in admin panel.friendica2012-02-233-3/+4
| * | system notifications to notify module, untranslated string in notifications.tplfriendica2012-02-231-1/+1
| |/
* | "Vier-Theme" Some more design stuff.Michael2012-02-264-336/+315
* | poller.php: Test for moving to archive, vier-style: notifications fixedMichael2012-02-251-3/+22
* | "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-254-20/+287
|/
* 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-232-22/+42
|\|
| * green-quattro: applied a color for shiny class and previewTobias Diekershoff2012-02-232-22/+42
* | quattro: fix typosFabio Comuni2012-02-232-4/+5
|/
* quattro post preview, style contacts pages, style for "shiny" class, fix cont...Fabio Comuni2012-02-2313-92/+221
* Merge branch 'master' into notifyfriendica2012-02-233-0/+153
|\
| * quattro: added styling to pivate message viewTobias Diekershoff2012-02-233-0/+153
* | more theme notify fixesfriendica2012-02-231-0/+1
* | new notify sort of working in testbubblefriendica2012-02-222-0/+4
* | Merge branch 'master' into notifyfriendica2012-02-228-9/+481
|\|
| * Merge pull request #45 from annando/masterfriendica2012-02-228-9/+481
| |\
| | * German translation more gender friendly. Some more logging in poller.phpMichael2012-02-226-6/+6
| | * Fetched some missing styles from testbubble.Michael2012-02-202-0/+395