aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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-292-1/+6
|/ /
* | reverting wall_item.tplFriendika2011-09-281-41/+60
* | Merge pull request #8 from duthied/masterFriendika2011-09-2827-522/+175
|\ \ | |/ |/|
| * classes added to core + testbubble themeDevlon Duthie2011-09-2927-522/+175
|/
* fix nav-selected duepuntozeroFriendika2011-09-283-9/+9
* path for country.js - now in js directoryFriendika2011-09-281-1/+1
* 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-283-3/+3
* fixes for statusnet/identi.ca empty vcard page - which appears to be deprecat...Friendika2011-09-281-1/+1
* apps broken in all themes, apps link misplaced in testbubbleFriendika2011-09-283-3/+2
* create zot batch keysFriendika2011-09-282-7/+32
* Merge pull request #6 from fabrixxm/masterfabrixxm2011-09-2832-567/+1070
|\
| * fix search_item.tpl, fix 'new' view in network page, fix walltowall template ...Fabio Comuni2011-09-287-307/+552
| * Items lock iconFabio Comuni2011-09-288-8/+24
| * added missing "delete selected items" linkFabio Comuni2011-09-282-16/+12
| * ping returns notices and infos also to unlogged usersFabio Comuni2011-09-281-153/+155
| * Merge remote-tracking branch 'friendika/master'Fabio Comuni2011-09-2815-13/+40
| |\
| * | quattro: actions in wall_itemFabio Comuni2011-09-2724-100/+344
* | | move connect button down a smidginFriendika2011-09-281-0/+1
| |/ |/|
* | 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 navbarFabio Comuni2011-09-272-1/+4
| |/
* / show profile url in ACL hovertips, add fork identifier to json siteinfoFriendika2011-09-274-6/+9
|/
* 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
| |\
| | * 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
|\|
| * 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
| | | |\ \ \