aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/friendica/friendicaVasudev Kamath2012-04-27402-22697/+13940
|\
| * Merge https://github.com/friendica/friendica into pullfriendica2012-04-274-20/+34
| |\
| | * fix some css errorsSimon L'nu2012-04-274-20/+34
| * | put community back on the lower tab. It belongs with message streamsfriendica2012-04-271-4/+3
| |/
| * Merge https://github.com/friendica/friendica into pullfriendica2012-04-275-1/+63
| |\
| | * fix 2 issues. contacts img in finder; wall filer titleSimon L'nu2012-04-275-1/+63
| * | fix view contactsfriendica2012-04-271-1/+1
| |/
| * reset qcomment selector after insert.friendica2012-04-261-0/+1
| * put fakelink back in birthday noticefriendica2012-04-261-1/+1
| * birthday contact link goes to event page instead of remote profilefriendica2012-04-261-1/+1
| * Merge https://github.com/friendica/friendica into pullfriendica2012-04-261-5/+5
| |\
| | * fix s/color/colour/g issueSimon L'nu2012-04-261-5/+5
| * | make comment edit icons look more like base themefriendica2012-04-263-28/+28
| |/
| * Merge pull request #267 from tomtom84/masterfriendica2012-04-261-1/+6
| |\
| | * diabook-themes: small-fixtommy tomson2012-04-261-1/+6
| * | announced dipsy change. re-tie your boots, we're in for a wee ride ;)Simon L'nu2012-04-2664-1515/+3857
| |/
| * Merge pull request #265 from cvogeley/masterfriendica2012-04-2614-2/+999
| |\
| | * duepuntozero: move community and manage link to upper right area + css fixes ...Christian Vogeley2012-04-251-0/+71
| | * duepuntozero: move community and manage link to upper right area + css fixes ...Christian Vogeley2012-04-251-2/+5
| | * added BBCODE thing in commentsChristian Vogeley2012-04-251-0/+38
| | * add cleanzero themeChristian Vogeley2012-04-2512-0/+885
| * | convert stylesheets to less, and compress output cssSimon L'nu2012-04-264-6353/+6793
| * | Diabook-dark more CSS fixes.Thomas Willingham2012-04-252-5/+16
| |/
| * this turns out to be harder than I thoughtfriendica2012-04-252-2/+2
| * Merge pull request #264 from mschmitt/masterfriendica2012-04-252-78/+112
| |\
| | * Esperanto at 100% againMartin Schmitt2012-04-252-78/+112
| * | Merge https://github.com/friendica/friendica into pullfriendica2012-04-2512-12/+96
| |\|
| | * Merge pull request #263 from tomtom84/mastertomtom842012-04-2412-12/+96
| | |\
| | | * diabook-themes: fix css to login.tpltommy tomson2012-04-2512-12/+96
| * | | cleanup - make bb-buttons vanish when comment closedfriendica2012-04-2514-374/+16
| |/ /
| * / restore qcomment selectorfriendica2012-04-247-21/+35
| |/
| * zero-themes: add bbcode-toolbar to commentboxtommy tomson2012-04-2522-0/+732
| * diabook-themes: small fixtommy tomson2012-04-253-8/+31
| * Merge pull request #261 from fabrixxm/eventspagefriendica2012-04-245-56/+131
| |\
| | * quattro: small week calendar view for event/birthday remindersFabio Comuni2012-04-242-0/+40
| | * remove html from get_birthdays() and get_events()Fabio Comuni2012-04-242-0/+20
| | * events page: set calendar start date from url (events/[year]/[month]/) and sh...Fabio Comuni2012-04-241-56/+71
| * | Diabook-dark css fixThomas Willingham2012-04-241-3/+3
| * | Diabook-dark, couple of new icons, and another css fix.Thomas Willingham2012-04-244-1/+1
| |/
| * Esperanto at 100% againMartin Schmitt2012-04-249-459/+733
| * Improvements to diabook-darkThomas Willingham2012-04-2421-4/+4
| * DE strings, correction of a typoTobias Diekershoff2012-04-232-198/+98
| * diabok-themes: fixed bug in green-wide and dark-widetommy tomson2012-04-235-12/+12
| * diabook-themes: small fix in nets_aside, group_aside and delete obsolete .tpl...tommy tomson2012-04-23211-13669/+5
| * diabook-themes: bugfix in admin-sectiontommy tomson2012-04-231-1/+1
| * diabook-themes: bugfixtommy tomson2012-04-2215-27/+31
| * diabook-themes: fixed youtube-bug and added "Info/Impressum" to footertommy tomson2012-04-2245-101/+108
| * DE strings updateTobias Diekershoff2012-04-228-542/+789
| * diabook-themes: comment-bbcode-bugfixtommy tomson2012-04-222-9/+9
* | Merge branch 'master' of git://github.com/friendica/friendicaVasudev Kamath2012-04-22380-38276/+1184
|\|