Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'friendika/master' | Fabio Comuni | 2011-09-28 | 15 | -13/+40 |
|\ | |||||
| * | connect button overlapping profile details | Friendika | 2011-09-27 | 2 | -0/+5 |
| | | |||||
| * | requeue deliveries on 503 errors which have 'retry-after' headers | Friendika | 2011-09-27 | 4 | -2/+9 |
| | | |||||
| * | zot/salmon new key format for batch keys | Friendika | 2011-09-27 | 4 | -3/+15 |
| | | |||||
| * | restore privacy icons after theme upgrade | Friendika | 2011-09-27 | 2 | -2/+2 |
| | | |||||
| * | Merge branch 'pull' | Friendika | 2011-09-27 | 2 | -1/+4 |
| |\ | |||||
| | * | Merge pull request #5 from fabrixxm/master | fabrixxm | 2011-09-27 | 2 | -1/+4 |
| | |\ | | | | | | | | | fix loozah themes navbar | ||||
| * | | | show profile url in ACL hovertips, add fork identifier to json siteinfo | Friendika | 2011-09-27 | 4 | -6/+9 |
| |/ / | |||||
* | / | quattro: actions in wall_item | Fabio Comuni | 2011-09-27 | 24 | -100/+344 |
| |/ |/| | | | | | | | | | less html in conversation.php removed unused tpls fixed old themes | ||||
* | | fix loozah themes navbar | Fabio Comuni | 2011-09-27 | 2 | -1/+4 |
|/ | |||||
* | loozah theme vcard float not cleared | Friendika | 2011-09-27 | 1 | -0/+3 |
| | |||||
* | Merge branch 'pull' | Friendika | 2011-09-27 | 9 | -42/+278 |
|\ | |||||
| * | Merge pull request #4 from fabrixxm/master | fabrixxm | 2011-09-27 | 9 | -42/+278 |
| |\ | | | | | | | missing commit :) | ||||
| | * | port old themes | Fabio Comuni | 2011-09-27 | 9 | -42/+278 |
| | | | |||||
* | | | vcard elements float not cleared | Friendika | 2011-09-27 | 1 | -0/+3 |
|/ / | |||||
* | | Merge pull request #3 from fabrixxm/master | Friendika | 2011-09-27 | 143 | -358/+2467 |
|\| | | | | | Works on UI | ||||
| * | Adds theme info file to define 'parent' theme from where load tpl files | Fabio Comuni | 2011-09-27 | 23 | -460/+142 |
| | | |||||
| * | Merge remote-tracking branch 'fabrix/newui' | Fabio Comuni | 2011-09-27 | 140 | -357/+2784 |
| |\ | |||||
| | * | remove global $lang var in templates. can't work as intended | Fabio Comuni | 2011-09-26 | 1 | -18/+1 |
| | | | |||||
| | * | fix "friend of" message in ping.php | Fabio Comuni | 2011-09-26 | 1 | -9/+15 |
| | | | |||||
| | * | quattro: fix star | Fabio Comuni | 2011-09-26 | 2 | -0/+5 |
| | | | |||||
| | * | Fixes for testbubble | Fabio Comuni | 2011-09-26 | 5 | -52/+104 |
| | | | |||||
| | * | Merge branch 'master' into newui | Fabio Comuni | 2011-09-26 | 246 | -12676/+7153 |
| | |\ | |||||
| | * | | Show "404.tpl" instead of using 'notice()' in case of 404 | Fabio Comuni | 2011-09-19 | 3 | -3/+9 |
| | | | | |||||
| | * | | quattro: initial style of conversations | Fabio Comuni | 2011-09-16 | 9 | -66/+367 |
| | | | | |||||
| | * | | new icons | Fabio Comuni | 2011-09-16 | 59 | -1/+15 |
| | | | | |||||
| | * | | Merge remote-tracking branch 'friendika/master' into newui | Fabio Comuni | 2011-09-16 | 30 | -484/+3182 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'newui' of github.com:fabrixxm/friendika into newui | Fabio Comuni | 2011-09-15 | 20 | -45/+5733 |
| | |\ \ \ | |||||
| | | * \ \ | Merge remote-tracking branch 'friendika/master' into newui | fabrixxm | 2011-09-08 | 20 | -45/+5733 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge branch 'newui' of github.com:fabrixxm/friendika into newui | fabrixxm | 2011-09-08 | 4 | -3/+9 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Merge branch 'newui' of github.com:fabrixxm/friendika into newui | fabrixxm | 2011-09-05 | 159 | -2284/+5000 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge remote-tracking branch 'friendika/master' into newui | fabrixxm | 2011-08-26 | 37 | -777/+3738 |
| | | |\ \ \ \ \ \ | |||||
| | * | | | | | | | | quattro | Fabio Comuni | 2011-09-15 | 4 | -5/+15 |
| | | |_|_|/ / / / | | |/| | | | | | | |||||
| | * | | | | | | | light notifications menu icon on new notifs | Fabio Comuni | 2011-09-08 | 1 | -1/+3 |
| | | | | | | | | | |||||
| | * | | | | | | | style vcard infos | Fabio Comuni | 2011-09-08 | 3 | -2/+6 |
| | | |_|/ / / / | | |/| | | | | | |||||
| | * | | | | | | profiles popup menu in sidebar | Fabio Comuni | 2011-09-05 | 4 | -6/+53 |
| | | | | | | | | |||||
| | * | | | | | | add *~ to gitignore | Fabio Comuni | 2011-09-05 | 1 | -0/+1 |
| | | | | | | | | |||||
| | * | | | | | | Load infos and notices via ping and show them with js popup | Fabio Comuni | 2011-09-05 | 22 | -12/+222 |
| | | | | | | | | |||||
| | * | | | | | | Add tipTip js tooltips | Fabio Comuni | 2011-09-05 | 5 | -2/+175 |
| | | | | | | | | |||||
| | * | | | | | | fix profile edit link and d* photo urls | Fabio Comuni | 2011-09-05 | 1 | -4/+4 |
| | | | | | | | | |||||
| | * | | | | | | fix aside contact block, add edit profiles icon | Fabio Comuni | 2011-09-05 | 3 | -5/+20 |
| | | | | | | | | |||||
| | * | | | | | | move js to js folder | Fabio Comuni | 2011-09-05 | 11 | -7/+9 |
| | | | | | | | | |||||
| | * | | | | | | move icons style in new file | Fabio Comuni | 2011-09-05 | 4 | -43/+146 |
| | | | | | | | | |||||
| | * | | | | | | More icons | Fabio Comuni | 2011-09-05 | 54 | -0/+14 |
| | | | | | | | | |||||
| | * | | | | | | Merge remote-tracking branch 'friendika/master' into newui | Fabio Comuni | 2011-09-05 | 46 | -1273/+2988 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Fix profile vcard and style | Fabio Comuni | 2011-09-01 | 6 | -15/+96 |
| | | | | | | | | | |||||
| | * | | | | | | | remove html from profile vcard code | Fabio Comuni | 2011-08-31 | 5 | -120/+131 |
| | | | | | | | | | |||||
| | * | | | | | | | quattro: more colors | Fabio Comuni | 2011-08-31 | 3 | -13/+25 |
| | | | | | | | | | |||||
| | * | | | | | | | quattro: cleanup and split of less files | Fabio Comuni | 2011-08-31 | 10 | -605/+273 |
| | | | | | | | | | |||||
| | * | | | | | | | Avoid a small error in admin | Fabio Comuni | 2011-08-31 | 1 | -1/+1 |
| | | | | | | | | |