aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'upstream/master'Michael Vogel2012-03-28232-1197/+18385
|\
| * Merge branch 'pull'friendica2012-03-282-10/+4
| |\
| | * really fix it this time...Simon L'nu2012-03-282-12/+4
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * WITH is going on?Simon L'nu2012-03-282-2/+4
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | Merge branch 'pull'friendica2012-03-2826-155/+470
| |\|
| | * Merge pull request #180 from simonlnu/masterSimon2012-03-282-11/+13
| | |\ | | | | | | | | duh...
| | | * doh fixSimon L'nu2012-03-282-11/+13
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * | Merge pull request #179 from fabrixxm/masterfabrixxm2012-03-286-27/+149
| | |\ \ | | | |/ | | |/| new field_combobox template and some eyecandy to "file as" function
| | | * filer: replace "file as" prompt with combobox opened in fancyboxFabio Comuni2012-03-285-27/+131
| | | |
| | | * template: field_comboboxFabio Comuni2012-03-281-0/+18
| | | | | | | | | | | | | | | | | | | | a text input plus a select wich updates text input value on change. html5 version commented out for poor browsers support.
| | * | add some icons for the newbie stuff (diabook but 24px not 32); fixes for ↵Simon L'nu2012-03-2820-130/+321
| | |/ | | | | | | | | | | | | | | | dispy (broken last push) Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * / 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 ↵tommy tomson2012-03-279-27/+198
| | | | | | | | | | | | cookies
| | * provide a close-option for boxes in right_aside and store info via js and ↵tommy tomson2012-03-276-19/+195
| | | | | | | | | | | | cookies
| * | turn on gecko spellcheck in tinymcefriendica2012-03-275-2/+6
| |/
| * more fixes for dispysSimon L'nu2012-03-276-10/+23
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * add dispy-dark snapshot; fix toolbarSimon L'nu2012-03-273-109/+197
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * 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
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * add "similar interrest", "Friend Suggestions" and "Invite Friends" to ↵tommy tomson2012-03-268-20/+50
| | | | | | | | right_aside, fixes in css
| * 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
| |\ | | | | | | Rearrange theme tpls
| | * 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
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * | add screenshots to diabooktommy tomson2012-03-264-3/+8
| | |/
| | * fix the search boxSimon L'nu2012-03-264-8/+22
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * 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
| |\
| | * add in the search boxSimon L'nu2012-03-256-13/+43
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-252-0/+4
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: theme screenshots * master:
| | * | minor fix to dispy theme.phpSimon L'nu2012-03-251-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | | theme preview for end usersfriendica2012-03-252-1/+10
| | |/ | |/|