aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'upstream/master'Michael Vogel2012-03-28598-11992/+36509
|\
| * Merge branch 'pull'friendica2012-03-284-11/+14
| |\
| | * Merge pull request #183 from simonlnu/masterSimon2012-03-282-12/+4
| | |\ | | | | | | | | final pull req for now. really fixed.
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-282-1/+10
| | | |\ | | | |/ | | |/| | | | | | | | | | | | | | | | | * remotes/upstream/master: viewsrc: return only body if page is requested via ajax * master:
| | * | Merge pull request #182 from fabrixxm/masterfabrixxm2012-03-282-1/+10
| | |\ \ | | | | | | | | | | viewsrc returns only text if page is requested via ajax
| | | * | viewsrc: return only body if page is requested via ajaxFabio Comuni2012-03-282-1/+10
| | | | |
| | * | | Merge pull request #181 from simonlnu/masterSimon2012-03-282-2/+4
| | |\ \ \ | | | | | | | | | | | | how the default.php gets read just changed from under me. not pleasant.
| | | | | * 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 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-280-0/+0
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: filer: replace "file as" prompt with combobox opened in fancybox filer: info() on item filed template: field_combobox * master:
| * | | Merge branch 'pull'friendica2012-03-2828-157/+485
| |\| |
| | * | 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-288-29/+164
| | |\ \ \ | | | | |/ | | | |/| new field_combobox template and some eyecandy to "file as" function
| | | * | filer: replace "file as" prompt with combobox opened in fancyboxFabio Comuni2012-03-286-29/+145
| | | | |
| | | * | filer: info() on item filedFabio Comuni2012-03-281-0/+1
| | | | |
| | | * | 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.
| | * | | Merge pull request #178 from simonlnu/masterSimon2012-03-2820-130/+321
| | |\ \ \ | | | |/ / | | |/| / | | | |/ i fixed the worst but ...
| | | * 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>
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-280-0/+0
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: support autocomplete @-tags in plaintext mode vier navbar messed up after default theme template move profile_tabs hook use theme directory for page templates, not language directory turn on gecko spellcheck in tinymce small fix in diabook fixes in diabook provide a close-option for boxes in right_aside and store info via js and cookies provide a close-option for boxes in right_aside and store info via js and cookies form security error when using existing photo * master:
| * / title not updated when editing postfriendica2012-03-282-2/+1
| |/
| * support autocomplete @-tags in plaintext modefriendica2012-03-282-0/+4
| |
| * vier navbar messed up after default theme template movefriendica2012-03-281-0/+131
| |
| * profile_tabs hookfriendica2012-03-272-2/+7
| |
| * use theme directory for page templates, not language directoryfriendica2012-03-271-2/+2
| |
| * 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
| | |
| | * Merge pull request #177 from tomtom84/mastertomtom842012-03-279-27/+198
| | |\ | | | | | | | | fixes in theme diabook
| | | * provide a close-option for boxes in right_aside and store info via js and ↵tommy tomson2012-03-279-27/+198
| | |/ | | | | | | | | | cookies
| | * Merge pull request #176 from tomtom84/mastertomtom842012-03-276-19/+195
| | |\ | | | | | | | | fixes in theme diabook-blue
| | | * 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-276-3/+7
| |/
| * Merge branch 'pull'friendica2012-03-276-115/+216
| |\
| | * Merge pull request #175 from simonlnu/masterSimon2012-03-276-115/+216
| | |\ | | | | | | | | various fixes for dispys
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-273-12/+18
| | | |\ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: profile wall privacy don't expire filed items * master:
| | | * 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>
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-2710-26/+42
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: add "find friends" to right_aside to diabook, fixes in css in diabook fixed Umlaute in de strings.php * master:
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: @-completion bug qcomment enhancements theme description with preview (non-translatable unfortunately) preparation for some possibly killer features translate br with extra elements revup Fixed regions for Germany, Bulgaria, Republic of Ireland, Scotland, Northern Ireland, Spain, and the UK. * master:
| * | | | form security error when using existing photofriendica2012-03-271-1/+1
| |/ / /
| * | | profile wall privacyfriendica2012-03-272-12/+13
| | | |
| * | | Merge branch 'pull'friendica2012-03-2710-26/+42
| |\ \ \ | | | |/ | | |/|
| | * | 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
| | |/
| * / don't expire filed itemsfriendica2012-03-271-0/+5
| |/
| * @-completion bugfriendica2012-03-261-5/+5
| |
| * qcomment enhancementsfriendica2012-03-263-5/+25
| |
| * theme description with preview (non-translatable unfortunately)friendica2012-03-263-2/+13
| |
| * preparation for some possibly killer featuresfriendica2012-03-263-15/+23
| |