aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge pull request #184 from annando/masterfriendica2012-03-282-5/+6
|\ \ \
| * \ \ Merge commit 'upstream/master'Michael Vogel2012-03-28232-1197/+18385
| |\ \ \ | | | |/ | | |/|
| * | | API: Seesmic is now working. Optimizing text export.Michael Vogel2012-03-182-5/+6
* | | | add a searchbox to "find friends" for global searchtommy tomson2012-03-288-9/+70
* | | | bugfix in diabooktommy tomson2012-03-285-13/+38
| |/ / |/| |
* | | Merge branch 'pull'friendica2012-03-282-10/+4
|\ \ \
| * | | really fix it this time...Simon L'nu2012-03-282-12/+4
| * | | WITH is going on?Simon L'nu2012-03-282-2/+4
* | | | Merge branch 'pull'friendica2012-03-2826-155/+470
|\| | |
| * | | Merge pull request #180 from simonlnu/masterSimon2012-03-282-11/+13
| |\ \ \
| | * | | doh fixSimon L'nu2012-03-282-11/+13
| * | | | Merge pull request #179 from fabrixxm/masterfabrixxm2012-03-286-27/+149
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | filer: replace "file as" prompt with combobox opened in fancyboxFabio Comuni2012-03-285-27/+131
| | * | template: field_comboboxFabio Comuni2012-03-281-0/+18
| * | | add some icons for the newbie stuff (diabook but 24px not 32); fixes for disp...Simon L'nu2012-03-2820-130/+321
| |/ /
* / / title not updated when editing postfriendica2012-03-281-1/+0
|/ /
* | support autocomplete @-tags in plaintext modefriendica2012-03-282-0/+4
* | vier navbar messed up after default theme template movefriendica2012-03-281-0/+131
* | Merge branch 'pull'friendica2012-03-2715-52/+435
|\ \
| * | small fix in diabooktommy tomson2012-03-273-3/+3
| * | fixes in diabooktommy tomson2012-03-276-13/+49
| * | provide a close-option for boxes in right_aside and store info via js and coo...tommy tomson2012-03-279-27/+198
| * | provide a close-option for boxes in right_aside and store info via js and coo...tommy tomson2012-03-276-19/+195
* | | turn on gecko spellcheck in tinymcefriendica2012-03-275-2/+6
|/ /
* | more fixes for dispysSimon L'nu2012-03-276-10/+23
* | add dispy-dark snapshot; fix toolbarSimon L'nu2012-03-273-109/+197
* | add "find friends" to right_aside to diabook, fixes in css in diabooktommy tomson2012-03-279-16/+32
* | fixed Umlaute in de strings.phpTobias Diekershoff2012-03-271-10/+10
* | qcomment enhancementsfriendica2012-03-263-5/+25
* | fix dispy's nav element; fix colours in #search-textSimon L'nu2012-03-262-5/+8
* | add "similar interrest", "Friend Suggestions" and "Invite Friends" to right_a...tommy tomson2012-03-268-20/+50
* | Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-03-2613-36/+29
|\ \
| * | minor css fixes in diabooktommy tomson2012-03-2612-36/+29
| * | screenshot for darkzero-NS, same as darkzerofriendica2012-03-261-0/+0
* | | marking quattro-green as extension of quattro and deleting the tpl filesTobias Diekershoff2012-03-2614-667/+11
|/ /
* | added quaddro templates to quaddro-greenTobias Diekershoff2012-03-2613-0/+667
* | Merge pull request #172 from fabrixxm/masterfriendica2012-03-2634-902/+902
|\ \
| * | diabook: small fix in theme_info arrayFabio Comuni2012-03-261-1/+1
| * | themes: use duepuntozero tpls as defaultFabio Comuni2012-03-2633-901/+901
* | | small fix in diabook :: add local friendica to right_asidetommy tomson2012-03-264-1/+3
* | | Merge branch 'pull'friendica2012-03-2612-22/+37
|\ \ \
| * | | [fix] contact_edit.tpl syntax; reduce cols to fit betterSimon L'nu2012-03-261-1/+1
| * | | add screenshots to diabooktommy tomson2012-03-264-3/+8
| |/ /
| * | fix the search boxSimon L'nu2012-03-264-8/+22
| * | small fixtommy tomson2012-03-264-11/+7
* | | comix screenshotfriendica2012-03-261-0/+0
* | | more theme screenshotsfriendica2012-03-267-0/+0
|/ /
* | position the theme-preview on settings pagefriendica2012-03-251-0/+4
* | screenshot galleryfriendica2012-03-2512-0/+0
* | Merge branch 'pull'friendica2012-03-256-14/+44
|\ \