aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/friendica/friendicaVasudev Kamath2012-07-0655-1748/+3638
|\
| * a bit more colourfriendica2012-07-051-0/+4
| * some initial code and benchmarking for "red" content rendering enginefriendica2012-07-041-0/+2
| * add smarty engine, remove some obsolete zot1 stufffriendica2012-07-032-22/+0
| * Diabook directory wide variants.Thomas Willingham2012-07-045-7/+239
| * Limiting .directory-photo-wrapper styles to <section> so as not toZvi ben Yaakov (a.k.a rdc)2012-07-037-7/+7
| * fix diabook directory pages (only the normal style - any volunteers for the w...friendica2012-07-026-24/+318
| * Various theme stuff.Thomas Willingham2012-07-024-7/+57
| * Merge pull request #369 from rdc/masterfriendica2012-07-012-5/+84
| |\
| | * Added more profile data and CSS styling to the /directory pageZvi ben Yaakov (a.k.a rdc)2012-07-012-5/+84
| * | Esperanto -> 100%Martin Schmitt2012-07-013-1555/+2127
| |/
| * advanced profile themingfriendica2012-06-301-1/+6
| * quattro: fix Forum widget, hide edit profile linkFabrixxm2012-06-293-3/+11
| * quattro: some updatesFabrixxm2012-06-2912-45/+629
| * maintain page position when hovering on pop-outsfriendica2012-06-281-0/+7
| * fix item-delete-selected* cssSimon L'nu2012-06-284-12/+12
| * insidious little parsing bugfriendica2012-06-261-2/+5
| * have no idea why the if/endif macro block was getting printed and not processed.friendica2012-06-261-6/+4
| * highlight js events-reminder on birthday eventsfriendica2012-06-271-1/+7
| * change event behaviour so that title is required but description is notfriendica2012-06-251-0/+24
| * event summary/titlefriendica2012-06-253-1/+12
| * fix margin of wall-item-bodySimon L'nu2012-06-254-4/+4
| * Merge pull request #361 from simonlnu/masterSimon2012-06-254-38/+14
| |\
| | * fix delete thingy, and minor clean upSimon L'nu2012-06-254-38/+14
| * | Added App::get_cached_avatar_image usage for displaying "Last users"Zvi ben Yaakov (a.k.a rdc)2012-06-251-1/+1
| |/
| * service limits for photo uploadsfriendica2012-06-252-0/+6
| * implement "follow" service limitsfriendica2012-06-241-1/+1
| * add like/dislike to profilesfriendica2012-06-242-0/+37
| * update jquery to 1.7.2; fix some dispy templates to be more in sync with view/Simon L'nu2012-06-238-39/+49
| * liking comments backendfriendica2012-06-233-4/+8
* | Merge branch 'master' of git://github.com/friendica/friendicaVasudev Kamath2012-06-2328-4480/+4967
|\|
| * minor tweaks to some tpl filesSimon L'nu2012-06-223-3/+4
| * allow rotation either CW or CCWZach Prezkuta2012-06-201-2/+6
| * Darkzero-NS fix weeks old BBIcon errorThomas Willingham2012-06-211-2/+2
| * Darkzero/NS - make the archives font the same colour as the other widgets.Thomas Willingham2012-06-212-0/+8
| * icon change; tweak button in toolbar; move site-locationSimon L'nu2012-06-207-3812/+3898
| * Merge pull request #342 from fabrixxm/mastertobiasd2012-06-191-0/+16
| |\
| | * quattro: in post display page, scroll to and flash selected commentFabio Comuni2012-06-191-0/+16
| * | position tweakfriendica2012-06-191-0/+5
| * | [DE] stringsTobias Diekershoff2012-06-192-655/+964
| |/
| * make subdued elements jump out at you on hoverfriendica2012-06-171-0/+15
| * highlight the lost contact messagefriendica2012-06-141-1/+1
| * Merge https://github.com/friendica/friendica into pullfriendica2012-06-141-1/+4
| |\
| | * quattro theme: show uncollapsed comments on display pagefabrixxm2012-06-141-1/+4
| * | better handling of dead contactsfriendica2012-06-141-0/+3
| |/
| * ajax append placeholder, fix some html warningsfriendica2012-06-138-3/+13
| * archive widgetfriendica2012-06-125-1/+28
* | Merge branch 'master' of git://github.com/friendica/friendicaVasudev Kamath2012-06-1111-460/+485
|\|
| * minor template updateSimon L'nu2012-06-092-7/+10
| * better events-reminder themingfriendica2012-06-072-4/+13