aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'upstream/master'Olivier Migeot2011-10-04145-1954/+19301
|\
| * Merge pull request #15 from fabrixxm/masterFriendika2011-10-036-69/+86
| |\
| | * fix typoFabio Comuni2011-10-031-2/+3
| | * quattro: add comment boxFabio Comuni2011-10-035-67/+83
| * | broke 'find similar' matches content into a tpl in core, added an extended tp...Devlon Duthie2011-10-033-47/+38
| |/
| * added activetab var to message.php for templatesDevlon Duthie2011-10-022-10/+13
| * Merge branch 'master' of http://github.com/friendika/Free-FriendikaDevlon Duthie2011-10-0237-2249/+42
| |\
| | * fix notifications duepuntozeroFriendika2011-10-021-1/+1
| | * Merge pull request #11 from duthied/masterFriendika2011-10-012-14/+25
| | |\
| | * | option to not post photos to status streamFriendika2011-10-012-0/+11
| | * | darkbubble - event legibilityFriendika2011-10-011-3/+7
| | * | legibility improvements to darkbubble, mark as a derived themeFriendika2011-10-0134-2248/+26
| * | | aspect ratio fixes for photos in testbubble themeDevlon Duthie2011-10-023-26/+54
| | |/ | |/|
| * | class and wrapper div added to photo for aspect ratio displayDevlon Duthie2011-10-012-14/+25
| |/
| * 1. added button class to tpl filesDevlon Duthie2011-09-309-84/+55
| * do not poll for abandoned accountsFriendika2011-09-291-0/+1
| * Merge branch 'pull'Friendika2011-09-292-117/+120
| |\
| | * Merge pull request #9 from tobiasd/6cf5da1e4bc43d8446f5789bc93f82673ec64c2etobiasd2011-09-292-117/+120
| | |\
| | | * update to the German stringsTobias Diekershoff2011-09-292-117/+120
| * | | added back for photos page until we can get rid of it cleanlyFriendika2011-09-291-0/+5
| |/ /
| * | reverting wall_item.tplFriendika2011-09-281-41/+60
| * | classes added to core + testbubble themeDevlon Duthie2011-09-2926-518/+169
| |/
| * fix nav-selected duepuntozeroFriendika2011-09-282-8/+8
| * missing uploads on testbubbleFriendika2011-09-282-2/+2
| * basic darkbubble - improve as neededFriendika2011-09-2833-0/+2255
| * just hostname not url in hm:host - host xrd documentFriendika2011-09-281-1/+1
| * apps broken in all themes, apps link misplaced in testbubbleFriendika2011-09-282-2/+2
| * create zot batch keysFriendika2011-09-281-7/+7
| * Merge pull request #6 from fabrixxm/masterfabrixxm2011-09-2823-130/+600
| |\
| | * fix search_item.tpl, fix 'new' view in network page, fix walltowall template ...Fabio Comuni2011-09-286-45/+272
| | * Items lock iconFabio Comuni2011-09-288-8/+24
| | * added missing "delete selected items" linkFabio Comuni2011-09-281-0/+7
| | * Merge remote-tracking branch 'friendika/master'Fabio Comuni2011-09-286-3/+16
| | |\
| | * | quattro: actions in wall_itemFabio Comuni2011-09-2716-77/+297
| * | | move connect button down a smidginFriendika2011-09-281-0/+1
| | |/ | |/|
| * | connect button overlapping profile detailsFriendika2011-09-272-0/+5
| * | zot/salmon new key format for batch keysFriendika2011-09-272-1/+9
| * | restore privacy icons after theme upgradeFriendika2011-09-272-2/+2
| |/
| * fix loozah themes navbarFabio Comuni2011-09-272-1/+4
| * loozah theme vcard float not clearedFriendika2011-09-271-0/+3
| * Merge branch 'pull'Friendika2011-09-278-42/+276
| |\
| | * port old themesFabio Comuni2011-09-278-42/+276
| * | vcard elements float not clearedFriendika2011-09-271-0/+3
| |/
| * Adds theme info file to define 'parent' theme from where load tpl filesFabio Comuni2011-09-2721-459/+132
| * Merge remote-tracking branch 'fabrix/newui'Fabio Comuni2011-09-2735-130/+1982
| |\
| | * quattro: fix starFabio Comuni2011-09-262-0/+5
| | * Fixes for testbubbleFabio Comuni2011-09-263-49/+100
| | * Merge branch 'master' into newuiFabio Comuni2011-09-2652-32/+6075
| | |\
| | * | Show "404.tpl" instead of using 'notice()' in case of 404Fabio Comuni2011-09-191-0/+1
| | * | quattro: initial style of conversationsFabio Comuni2011-09-166-44/+308