Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'upstream/master' | Olivier Migeot | 2011-10-04 | 145 | -1954/+19301 |
|\ | |||||
| * | Merge pull request #15 from fabrixxm/master | Friendika | 2011-10-03 | 6 | -69/+86 |
| |\ | | | | | | | some work on quattro theme and a little fix to JS | ||||
| | * | fix typo | Fabio Comuni | 2011-10-03 | 1 | -2/+3 |
| | | | |||||
| | * | quattro: add comment box | Fabio Comuni | 2011-10-03 | 5 | -67/+83 |
| | | | |||||
| * | | broke 'find similar' matches content into a tpl in core, added an extended ↵ | Devlon Duthie | 2011-10-03 | 3 | -47/+38 |
| |/ | | | | | | | tpl to testbubble that lists the profile tags | ||||
| * | added activetab var to message.php for templates | Devlon Duthie | 2011-10-02 | 2 | -10/+13 |
| | | | | | | | | | | (testbubble only) added logic to photo header to make tab 'sticky' (active class for styling) (testbubble only) css fix for avatars in wallitems | ||||
| * | Merge branch 'master' of http://github.com/friendika/Free-Friendika | Devlon Duthie | 2011-10-02 | 37 | -2249/+42 |
| |\ | |||||
| | * | fix notifications duepuntozero | Friendika | 2011-10-02 | 1 | -1/+1 |
| | | | |||||
| | * | Merge pull request #11 from duthied/master | Friendika | 2011-10-01 | 2 | -14/+25 |
| | |\ | | | | | | | | | Aspect ratio improvement for photos in album, implemented only in testbubble theme | ||||
| | * | | option to not post photos to status stream | Friendika | 2011-10-01 | 2 | -0/+11 |
| | | | | |||||
| | * | | darkbubble - event legibility | Friendika | 2011-10-01 | 1 | -3/+7 |
| | | | | |||||
| | * | | legibility improvements to darkbubble, mark as a derived theme | Friendika | 2011-10-01 | 34 | -2248/+26 |
| | | | | |||||
| * | | | aspect ratio fixes for photos in testbubble theme | Devlon Duthie | 2011-10-02 | 3 | -26/+54 |
| | |/ | |/| | | | | | | | some other testbubble styling tweaks | ||||
| * | | class and wrapper div added to photo for aspect ratio display | Devlon Duthie | 2011-10-01 | 2 | -14/+25 |
| |/ | | | | | | | testbubble theme styling for aspect ratio on photos | ||||
| * | 1. added button class to tpl files | Devlon Duthie | 2011-09-30 | 9 | -84/+55 |
| | | | | | | | | | | | | | | 2. messages - moved delete X into message div and new message form div 3. began work on creating thumbnail versions of albums - needs aspect ratio correction (javascript) 4. changed font-size and font-variation on vcard for better readability. 5. streamlining continued with the CSS file | ||||
| * | do not poll for abandoned accounts | Friendika | 2011-09-29 | 1 | -0/+1 |
| | | |||||
| * | Merge branch 'pull' | Friendika | 2011-09-29 | 2 | -117/+120 |
| |\ | |||||
| | * | Merge pull request #9 from tobiasd/6cf5da1e4bc43d8446f5789bc93f82673ec64c2e | tobiasd | 2011-09-29 | 2 | -117/+120 |
| | |\ | | | | | | | | | German strings | ||||
| | | * | update to the German strings | Tobias Diekershoff | 2011-09-29 | 2 | -117/+120 |
| | | | | |||||
| * | | | added back for photos page until we can get rid of it cleanly | Friendika | 2011-09-29 | 1 | -0/+5 |
| |/ / | |||||
| * | | reverting wall_item.tpl | Friendika | 2011-09-28 | 1 | -41/+60 |
| | | | |||||
| * | | classes added to core + testbubble theme | Devlon Duthie | 2011-09-29 | 26 | -518/+169 |
| |/ | | | | | | | some fixes to testbubble theme related to tab styling | ||||
| * | fix nav-selected duepuntozero | Friendika | 2011-09-28 | 2 | -8/+8 |
| | | |||||
| * | missing uploads on testbubble | Friendika | 2011-09-28 | 2 | -2/+2 |
| | | |||||
| * | basic darkbubble - improve as needed | Friendika | 2011-09-28 | 33 | -0/+2255 |
| | | |||||
| * | just hostname not url in hm:host - host xrd document | Friendika | 2011-09-28 | 1 | -1/+1 |
| | | |||||
| * | apps broken in all themes, apps link misplaced in testbubble | Friendika | 2011-09-28 | 2 | -2/+2 |
| | | |||||
| * | create zot batch keys | Friendika | 2011-09-28 | 1 | -7/+7 |
| | | |||||
| * | Merge pull request #6 from fabrixxm/master | fabrixxm | 2011-09-28 | 23 | -130/+600 |
| |\ | | | | | | | more work on ui | ||||
| | * | fix search_item.tpl, fix 'new' view in network page, fix walltowall template ↵ | Fabio Comuni | 2011-09-28 | 6 | -45/+272 |
| | | | | | | | | | | | | in 'quattro' theme | ||||
| | * | Items lock icon | Fabio Comuni | 2011-09-28 | 8 | -8/+24 |
| | | | |||||
| | * | added missing "delete selected items" link | Fabio Comuni | 2011-09-28 | 1 | -0/+7 |
| | | | |||||
| | * | Merge remote-tracking branch 'friendika/master' | Fabio Comuni | 2011-09-28 | 6 | -3/+16 |
| | |\ | |||||
| | * | | quattro: actions in wall_item | Fabio Comuni | 2011-09-27 | 16 | -77/+297 |
| | | | | | | | | | | | | | | | | | | | | | | | | less html in conversation.php removed unused tpls fixed old themes | ||||
| * | | | move connect button down a smidgin | Friendika | 2011-09-28 | 1 | -0/+1 |
| | |/ | |/| | |||||
| * | | connect button overlapping profile details | Friendika | 2011-09-27 | 2 | -0/+5 |
| | | | |||||
| * | | zot/salmon new key format for batch keys | Friendika | 2011-09-27 | 2 | -1/+9 |
| | | | |||||
| * | | restore privacy icons after theme upgrade | Friendika | 2011-09-27 | 2 | -2/+2 |
| |/ | |||||
| * | 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 | 8 | -42/+276 |
| |\ | |||||
| | * | port old themes | Fabio Comuni | 2011-09-27 | 8 | -42/+276 |
| | | | |||||
| * | | vcard elements float not cleared | Friendika | 2011-09-27 | 1 | -0/+3 |
| |/ | |||||
| * | Adds theme info file to define 'parent' theme from where load tpl files | Fabio Comuni | 2011-09-27 | 21 | -459/+132 |
| | | |||||
| * | Merge remote-tracking branch 'fabrix/newui' | Fabio Comuni | 2011-09-27 | 35 | -130/+1982 |
| |\ | |||||
| | * | quattro: fix star | Fabio Comuni | 2011-09-26 | 2 | -0/+5 |
| | | | |||||
| | * | Fixes for testbubble | Fabio Comuni | 2011-09-26 | 3 | -49/+100 |
| | | | |||||
| | * | Merge branch 'master' into newui | Fabio Comuni | 2011-09-26 | 52 | -32/+6075 |
| | |\ | |||||
| | * | | Show "404.tpl" instead of using 'notice()' in case of 404 | Fabio Comuni | 2011-09-19 | 1 | -0/+1 |
| | | | | |||||
| | * | | quattro: initial style of conversations | Fabio Comuni | 2011-09-16 | 6 | -44/+308 |
| | | | |