Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git://github.com/friendica/friendica | Vasudev Kamath | 2012-07-06 | 55 | -1748/+3638 |
|\ | |||||
| * | a bit more colour | friendica | 2012-07-05 | 1 | -0/+4 |
| | | |||||
| * | some initial code and benchmarking for "red" content rendering engine | friendica | 2012-07-04 | 1 | -0/+2 |
| | | |||||
| * | add smarty engine, remove some obsolete zot1 stuff | friendica | 2012-07-03 | 2 | -22/+0 |
| | | |||||
| * | Diabook directory wide variants. | Thomas Willingham | 2012-07-04 | 5 | -7/+239 |
| | | |||||
| * | Limiting .directory-photo-wrapper styles to <section> so as not to | Zvi ben Yaakov (a.k.a rdc) | 2012-07-03 | 7 | -7/+7 |
| | | | | | | | | interfere with .directory-photo-wrapper in <aside> | ||||
| * | fix diabook directory pages (only the normal style - any volunteers for the ↵ | friendica | 2012-07-02 | 6 | -24/+318 |
| | | | | | | | | wide?) | ||||
| * | Various theme stuff. | Thomas Willingham | 2012-07-02 | 4 | -7/+57 |
| | | | | | | | | | | | | Profile group list for testbubble Screenshot for facepark Various niggles in darkzero/NS | ||||
| * | Merge pull request #369 from rdc/master | friendica | 2012-07-01 | 2 | -5/+84 |
| |\ | | | | | | | Added more profile data and CSS styling to the /directory page | ||||
| | * | Added more profile data and CSS styling to the /directory page | Zvi ben Yaakov (a.k.a rdc) | 2012-07-01 | 2 | -5/+84 |
| | | | |||||
| * | | Esperanto -> 100% | Martin Schmitt | 2012-07-01 | 3 | -1555/+2127 |
| |/ | |||||
| * | advanced profile theming | friendica | 2012-06-30 | 1 | -1/+6 |
| | | |||||
| * | quattro: fix Forum widget, hide edit profile link | Fabrixxm | 2012-06-29 | 3 | -3/+11 |
| | | |||||
| * | quattro: some updates | Fabrixxm | 2012-06-29 | 12 | -45/+629 |
| | | | | | | | | | | | | - add makefile to rebuild both css with single command - fix icons in Forums widget - style photos pages | ||||
| * | maintain page position when hovering on pop-outs | friendica | 2012-06-28 | 1 | -0/+7 |
| | | |||||
| * | fix item-delete-selected* css | Simon L'nu | 2012-06-28 | 4 | -12/+12 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | insidious little parsing bug | friendica | 2012-06-26 | 1 | -2/+5 |
| | | |||||
| * | have no idea why the if/endif macro block was getting printed and not processed. | friendica | 2012-06-26 | 1 | -6/+4 |
| | | |||||
| * | highlight js events-reminder on birthday events | friendica | 2012-06-27 | 1 | -1/+7 |
| | | |||||
| * | change event behaviour so that title is required but description is not | friendica | 2012-06-25 | 1 | -0/+24 |
| | | |||||
| * | event summary/title | friendica | 2012-06-25 | 3 | -1/+12 |
| | | |||||
| * | fix margin of wall-item-body | Simon L'nu | 2012-06-25 | 4 | -4/+4 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | Merge pull request #361 from simonlnu/master | Simon | 2012-06-25 | 4 | -38/+14 |
| |\ | | | | | | | cleaned up the css a bit | ||||
| | * | fix delete thingy, and minor clean up | Simon L'nu | 2012-06-25 | 4 | -38/+14 |
| | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | Added App::get_cached_avatar_image usage for displaying "Last users" | Zvi ben Yaakov (a.k.a rdc) | 2012-06-25 | 1 | -1/+1 |
| |/ | | | | | | | avatar thumbs in right sidebar | ||||
| * | service limits for photo uploads | friendica | 2012-06-25 | 2 | -0/+6 |
| | | |||||
| * | implement "follow" service limits | friendica | 2012-06-24 | 1 | -1/+1 |
| | | |||||
| * | add like/dislike to profiles | friendica | 2012-06-24 | 2 | -0/+37 |
| | | |||||
| * | update jquery to 1.7.2; fix some dispy templates to be more in sync with view/ | Simon L'nu | 2012-06-23 | 8 | -39/+49 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | liking comments backend | friendica | 2012-06-23 | 3 | -4/+8 |
| | | |||||
* | | Merge branch 'master' of git://github.com/friendica/friendica | Vasudev Kamath | 2012-06-23 | 28 | -4480/+4967 |
|\| | |||||
| * | minor tweaks to some tpl files | Simon L'nu | 2012-06-22 | 3 | -3/+4 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | allow rotation either CW or CCW | Zach Prezkuta | 2012-06-20 | 1 | -2/+6 |
| | | |||||
| * | Darkzero-NS fix weeks old BBIcon error | Thomas Willingham | 2012-06-21 | 1 | -2/+2 |
| | | |||||
| * | Darkzero/NS - make the archives font the same colour as the other widgets. | Thomas Willingham | 2012-06-21 | 2 | -0/+8 |
| | | |||||
| * | icon change; tweak button in toolbar; move site-location | Simon L'nu | 2012-06-20 | 7 | -3812/+3898 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | Merge pull request #342 from fabrixxm/master | tobiasd | 2012-06-19 | 1 | -0/+16 |
| |\ | | | | | | | quattro: auto scroll and flash comment in display page | ||||
| | * | quattro: in post display page, scroll to and flash selected comment | Fabio Comuni | 2012-06-19 | 1 | -0/+16 |
| | | | |||||
| * | | position tweak | friendica | 2012-06-19 | 1 | -0/+5 |
| | | | |||||
| * | | [DE] strings | Tobias Diekershoff | 2012-06-19 | 2 | -655/+964 |
| |/ | |||||
| * | make subdued elements jump out at you on hover | friendica | 2012-06-17 | 1 | -0/+15 |
| | | |||||
| * | highlight the lost contact message | friendica | 2012-06-14 | 1 | -1/+1 |
| | | |||||
| * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-14 | 1 | -1/+4 |
| |\ | |||||
| | * | quattro theme: show uncollapsed comments on display page | fabrixxm | 2012-06-14 | 1 | -1/+4 |
| | | | |||||
| * | | better handling of dead contacts | friendica | 2012-06-14 | 1 | -0/+3 |
| |/ | |||||
| * | ajax append placeholder, fix some html warnings | friendica | 2012-06-13 | 8 | -3/+13 |
| | | |||||
| * | archive widget | friendica | 2012-06-12 | 5 | -1/+28 |
| | | |||||
* | | Merge branch 'master' of git://github.com/friendica/friendica | Vasudev Kamath | 2012-06-11 | 11 | -460/+485 |
|\| | |||||
| * | minor template update | Simon L'nu | 2012-06-09 | 2 | -7/+10 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | better events-reminder theming | friendica | 2012-06-07 | 2 | -4/+13 |
| | |