aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'friendika/master'Fabio Comuni2011-09-2815-13/+40
|\
| * connect button overlapping profile detailsFriendika2011-09-272-0/+5
| |
| * requeue deliveries on 503 errors which have 'retry-after' headersFriendika2011-09-274-2/+9
| |
| * zot/salmon new key format for batch keysFriendika2011-09-274-3/+15
| |
| * restore privacy icons after theme upgradeFriendika2011-09-272-2/+2
| |
| * Merge branch 'pull'Friendika2011-09-272-1/+4
| |\
| | * Merge pull request #5 from fabrixxm/masterfabrixxm2011-09-272-1/+4
| | |\ | | | | | | | | fix loozah themes navbar
| * | | show profile url in ACL hovertips, add fork identifier to json siteinfoFriendika2011-09-274-6/+9
| |/ /
* | / quattro: actions in wall_itemFabio Comuni2011-09-2724-100/+344
| |/ |/| | | | | | | | | less html in conversation.php removed unused tpls fixed old themes
* | fix loozah themes navbarFabio Comuni2011-09-272-1/+4
|/
* loozah theme vcard float not clearedFriendika2011-09-271-0/+3
|
* Merge branch 'pull'Friendika2011-09-279-42/+278
|\
| * Merge pull request #4 from fabrixxm/masterfabrixxm2011-09-279-42/+278
| |\ | | | | | | missing commit :)
| | * port old themesFabio Comuni2011-09-279-42/+278
| | |
* | | vcard elements float not clearedFriendika2011-09-271-0/+3
|/ /
* | Merge pull request #3 from fabrixxm/masterFriendika2011-09-27143-358/+2467
|\| | | | | Works on UI
| * Adds theme info file to define 'parent' theme from where load tpl filesFabio Comuni2011-09-2723-460/+142
| |
| * Merge remote-tracking branch 'fabrix/newui'Fabio Comuni2011-09-27140-357/+2784
| |\
| | * remove global $lang var in templates. can't work as intendedFabio Comuni2011-09-261-18/+1
| | |
| | * fix "friend of" message in ping.phpFabio Comuni2011-09-261-9/+15
| | |
| | * quattro: fix starFabio Comuni2011-09-262-0/+5
| | |
| | * Fixes for testbubbleFabio Comuni2011-09-265-52/+104
| | |
| | * Merge branch 'master' into newuiFabio Comuni2011-09-26246-12676/+7153
| | |\
| | * | Show "404.tpl" instead of using 'notice()' in case of 404Fabio Comuni2011-09-193-3/+9
| | | |
| | * | quattro: initial style of conversationsFabio Comuni2011-09-169-66/+367
| | | |
| | * | new iconsFabio Comuni2011-09-1659-1/+15
| | | |
| | * | Merge remote-tracking branch 'friendika/master' into newuiFabio Comuni2011-09-1630-484/+3182
| | |\ \
| | * \ \ Merge branch 'newui' of github.com:fabrixxm/friendika into newuiFabio Comuni2011-09-1520-45/+5733
| | |\ \ \
| | | * \ \ Merge remote-tracking branch 'friendika/master' into newuifabrixxm2011-09-0820-45/+5733
| | | |\ \ \
| | | * \ \ \ Merge branch 'newui' of github.com:fabrixxm/friendika into newuifabrixxm2011-09-084-3/+9
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'newui' of github.com:fabrixxm/friendika into newuifabrixxm2011-09-05159-2284/+5000
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge remote-tracking branch 'friendika/master' into newuifabrixxm2011-08-2637-777/+3738
| | | |\ \ \ \ \ \
| | * | | | | | | | quattroFabio Comuni2011-09-154-5/+15
| | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | light notifications menu icon on new notifsFabio Comuni2011-09-081-1/+3
| | | | | | | | |
| | * | | | | | | style vcard infosFabio Comuni2011-09-083-2/+6
| | | |_|/ / / / | | |/| | | | |
| | * | | | | | profiles popup menu in sidebarFabio Comuni2011-09-054-6/+53
| | | | | | | |
| | * | | | | | add *~ to gitignoreFabio Comuni2011-09-051-0/+1
| | | | | | | |
| | * | | | | | Load infos and notices via ping and show them with js popupFabio Comuni2011-09-0522-12/+222
| | | | | | | |
| | * | | | | | Add tipTip js tooltipsFabio Comuni2011-09-055-2/+175
| | | | | | | |
| | * | | | | | fix profile edit link and d* photo urlsFabio Comuni2011-09-051-4/+4
| | | | | | | |
| | * | | | | | fix aside contact block, add edit profiles iconFabio Comuni2011-09-053-5/+20
| | | | | | | |
| | * | | | | | move js to js folderFabio Comuni2011-09-0511-7/+9
| | | | | | | |
| | * | | | | | move icons style in new fileFabio Comuni2011-09-054-43/+146
| | | | | | | |
| | * | | | | | More iconsFabio Comuni2011-09-0554-0/+14
| | | | | | | |
| | * | | | | | Merge remote-tracking branch 'friendika/master' into newuiFabio Comuni2011-09-0546-1273/+2988
| | |\ \ \ \ \ \
| | * | | | | | | Fix profile vcard and styleFabio Comuni2011-09-016-15/+96
| | | | | | | | |
| | * | | | | | | remove html from profile vcard codeFabio Comuni2011-08-315-120/+131
| | | | | | | | |
| | * | | | | | | quattro: more colorsFabio Comuni2011-08-313-13/+25
| | | | | | | | |
| | * | | | | | | quattro: cleanup and split of less filesFabio Comuni2011-08-3110-605/+273
| | | | | | | | |
| | * | | | | | | Avoid a small error in adminFabio Comuni2011-08-311-1/+1
| | | | | | | | |