aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-02-231-21/+0
|\
| * quattro-green: removed contact_template.tplTobias Diekershoff2012-02-231-21/+0
* | Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-02-232-22/+42
|\|
| * green-quattro: applied a color for shiny class and previewTobias Diekershoff2012-02-232-22/+42
* | quattro: fix typosFabio Comuni2012-02-232-4/+5
|/
* quattro post preview, style contacts pages, style for "shiny" class, fix cont...Fabio Comuni2012-02-2313-92/+221
* Merge branch 'master' into notifyfriendica2012-02-233-0/+153
|\
| * quattro: added styling to pivate message viewTobias Diekershoff2012-02-233-0/+153
* | more theme notify fixesfriendica2012-02-231-0/+1
* | new notify sort of working in testbubblefriendica2012-02-222-0/+4
* | Merge branch 'master' into notifyfriendica2012-02-228-9/+481
|\|
| * Merge pull request #45 from annando/masterfriendica2012-02-228-9/+481
| |\
| | * German translation more gender friendly. Some more logging in poller.phpMichael2012-02-226-6/+6
| | * Fetched some missing styles from testbubble.Michael2012-02-202-0/+395
| | * New version of markdown. Playing with stylesheet. Testing line breaks.root2012-02-191-0/+11
| | * Many small changesMichael2012-02-191-23/+0
| | * Merge remote branch 'upstream/master'Michael2012-02-1948-4636/+6755
| | |\
| | * | New theme "vier" derives from "quattro"ike2012-02-1911-0/+4270
* | | | some cleanup of tb notificationsfriendica2012-02-212-1/+6
|/ / /
* | | view/admin_remoteupdate.tpl - Friendika -> FriendicaAbinoam P. Marques Jr2012-02-201-2/+2
* | | htconfig.tpl - Friendika -> FriendicaAbinoam P. Marques Jr2012-02-207-14/+14
* | | mod/dfrn_request.php and templates - Friendika -> FriendicaAbinoam P. Marques Jr2012-02-202-2/+2
| |/ |/|
* | support plaintext on editpost, editorinit called before all buttons laid outfriendica2012-02-176-8/+7
* | de stringsTobias Diekershoff2012-02-162-4552/+4527
* | quick commentsfriendica2012-02-157-2/+95
* | Merge pull request #36 from fabrixxm/masterfabrixxm2012-02-157-5/+171
|\ \
| * | enable ajax calendar with $a->config['experimentals']['new_calendar']=1Fabio Comuni2012-02-152-1/+25
| * | quattro: icons for attachmentsFabio Comuni2012-02-152-0/+65
| * | events js: don't modify rendered item if not autor specifiedFabio Comuni2012-02-141-7/+8
| * | events: first test for full-javascript events calendarFabio Comuni2012-02-144-5/+81
* | | preliminary qcomment support, [nosmile] tag to disable smiley processingfriendica2012-02-143-0/+32
* | | delete mail message icon not brightening on hoverfriendica2012-02-141-1/+1
* | | more contacts categorisation, page cleanupfriendica2012-02-131-2/+3
* | | tabs and total count for contacts pagefriendica2012-02-132-5/+6
* | | more stray quotesfriendica2012-02-137-7/+7
* | | make hr bbtag shareable, stray quote in duepuntozero wall_itemfriendica2012-02-131-1/+1
* | | Merge branch 'pull'friendica2012-02-139-2/+1527
|\ \ \
| * | | green variation of the quattro themeTobias Diekershoff2012-02-135-0/+1503
| |/ /
| * | Fix 'item not found' messageFabio Comuni2012-02-131-1/+1
| * | Merge remote-tracking branch 'friendica/master' into mobileFabio Comuni2012-02-1319-3/+4309
| |\ \
| * | | quattro: pause iconFabio Comuni2012-02-132-0/+12
| * | | reshare in "display" viewFabio Comuni2012-02-131-3/+2
| * | | hidden jot in "display" to allow reshareFabio Comuni2012-02-101-0/+3
| * | | quattro: add "view in context" link in search resultsFabio Comuni2012-02-101-1/+9
* | | | POST should be lowercase these daysfriendica2012-02-131-1/+1
| |/ / |/| |
* | | fix link/bookmark resharesfriendica2012-02-111-0/+1
* | | bug #278 show only blocked contactsfriendica2012-02-111-1/+2
* | | show tags (pub_keywords) in advanced profilefriendica2012-02-111-0/+7
* | | item tag notificationsfriendica2012-02-091-0/+1
* | | fix apps sub-menu on quattro and vierfriendica2012-02-082-1/+1