aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge branch 'pull'friendica2012-04-015-11/+31
|\ \
| * | latest fixes for dispys. tweaking/repairingSimon L'nu2012-04-015-11/+31
* | | send unverified private mail using zrlfriendica2012-04-015-0/+131
|/ /
* | diabook-themes: move "common tabs" to left side on settings pagetommy tomson2012-03-3112-47/+31
* | move the common tabs to right_aside in diabook-derivatestommy tomson2012-03-3112-0/+10514
* | Merge branch 'pull'friendica2012-03-3125-116/+355
|\ \
| * | bug fix in diabook-aerith and -redtommy tomson2012-03-316-22/+22
| * | bug-fixes in diabook-derivatestommy tomson2012-03-3117-40/+249
| * | forgot the css changes for last pushSimon L'nu2012-03-312-14/+2
| * | theme fixes; fix qcomment (finally)Simon L'nu2012-03-314-44/+86
* | | settings for unknown private mail acceptancefriendica2012-03-311-0/+4
|/ /
* | quattro: move quattro-green inside quattro folder.Fabio Comuni2012-03-3016-72/+87
* | Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-03-306-14/+36
|\ \
| * | css-fixes in diabook-derivatestommy tomson2012-03-306-14/+36
* | | quattro-green: remove settings codeFabio Comuni2012-03-301-29/+0
* | | quattro: add config.phpFabio Comuni2012-03-303-35/+35
* | | settings: add "display settings" tab, with UI-related settings.Fabio Comuni2012-03-302-4/+24
|/ /
* | css-fixes in diabook-derivatestommy tomson2012-03-308-32/+29
* | css-fixes in diabook-derivatestommy tomson2012-03-306-9/+19
* | quattro-green: added Description to the theme.phpTobias Diekershoff2012-03-301-0/+1
* | quattro-green: adopted quattro option for centered displayTobias Diekershoff2012-03-302-1/+56
* | add themes diabook-red & diabook-aerithtommy tomson2012-03-30170-6/+18107
* | quattro-greey: apply theming to private mailTobias Diekershoff2012-03-302-29/+128
* | tweaking stuff in dispys. i thought i fixed the login screens, but they're b0...Simon L'nu2012-03-296-58/+44
* | theme file_as combobox for 2.0friendica2012-03-292-1/+8
* | css fixes in diabook-derivatestommy tomson2012-03-2916-23/+136
* | Merge pull request #185 from fabrixxm/masterfabrixxm2012-03-2812-70/+439
|\ \
| * | quattro: style pm pagesFabio Comuni2012-03-288-64/+405
| * | message: remove tabs, move new message link to aside, all message with gmail-...Fabio Comuni2012-03-283-6/+22
| * | Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-03-2821-129/+315
| |\ \
| * | | quattro: tpl for "file as"Fabio Comuni2012-03-281-0/+12
* | | | 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
|\ \ \