aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* 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
| * fix a random profile error messagefabrixxm2012-06-071-1/+1
| * Merge https://github.com/friendica/friendica into pullfriendica2012-06-062-54/+48
| |\
| | * A few corrections in German translations.zottel2012-06-072-54/+48
| * | admin page untranslated strings, remove empty list element for updatefriendica2012-06-061-3/+5
| |/
| * rev updatefriendica2012-06-061-0/+4
| * Merge https://github.com/friendica/friendica into pullfriendica2012-06-0511-446/+842
| |\
| | * DE: update for the stringsTobias Diekershoff2012-06-052-398/+408
| * | named anchors on display pagefriendica2012-06-043-0/+3
* | | Merge branch 'master' of git://github.com/friendica/friendicaVasudev Kamath2012-06-045-6/+380
|\ \ \ | | |/ | |/|
| * | quattro: added editor buttons to commentsTobias Diekershoff2012-06-045-6/+380
* | | Merge branch 'master' of git://github.com/friendica/friendicaVasudev Kamath2012-06-0470-2656/+3911
|\| |
| * | quattro: cleanup the less fileTobias Diekershoff2012-06-043-38/+50
| * | fix mini photo-menu bugSimon L'nu2012-06-034-6/+6
| |/
| * Fix bugs in the retraction codeZach Prezkuta2012-06-032-3/+3
| * Implement relaying of relayable_retractionsZach Prezkuta2012-06-032-0/+21
| * quattro: admin panel styling and 1st buttons for addon/theme overviewTobias Diekershoff2012-06-036-65/+281
| * privacy settings: make submit button translateableTobias Diekershoff2012-06-031-1/+1
| * DE: update to the stringsTobias Diekershoff2012-06-032-845/+909
| * prv messages: make submit translateableTobias Diekershoff2012-06-031-1/+1
| * add hometown to profilesfriendica2012-06-023-2/+17
| * "howlong" added to marital status.friendica2012-06-022-1/+4
| * some zero theming on settings pagefriendica2012-05-303-5/+18
| * transition to beta for private forumsfriendica2012-05-301-2/+0
| * private group tests, cont.friendica2012-05-291-0/+1
| * hide private group if desiredfriendica2012-05-291-0/+4
| * Merge pull request #316 from annando/masterSimon2012-05-291-0/+5
| |\
| | * Merge remote branch 'upstream/master'Michael Vogel2012-05-2915-300/+205
| | |\
| | * \ Merge remote branch 'upstream/master'Michael Vogel2012-05-2533-1173/+1697
| | |\ \
| | * | | Performance testsMichael Vogel2012-05-201-0/+5
| * | | | fix toolbar. more size dynamicismSimon L'nu2012-05-295-28/+38
| | |_|/ | |/| |