| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge commit 'upstream/master' | Michael Vogel | 2012-03-28 | 598 | -11992/+36509 |
| |\ | |||||
| | * | Merge branch 'pull' | friendica | 2012-03-28 | 4 | -11/+14 |
| | |\ | |||||
| | | * | Merge pull request #183 from simonlnu/master | Simon | 2012-03-28 | 2 | -12/+4 |
| | | |\ | | | | | | | | | final pull req for now. really fixed. | ||||
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-28 | 2 | -1/+10 |
| | | | |\ | | | |/ | | |/| | | | | | | | | | | | | | | | | | * remotes/upstream/master: viewsrc: return only body if page is requested via ajax * master: | ||||
| | | * | | Merge pull request #182 from fabrixxm/master | fabrixxm | 2012-03-28 | 2 | -1/+10 |
| | | |\ \ | | | | | | | | | | | viewsrc returns only text if page is requested via ajax | ||||
| | | | * | | viewsrc: return only body if page is requested via ajax | Fabio Comuni | 2012-03-28 | 2 | -1/+10 |
| | | | | | | |||||
| | | * | | | Merge pull request #181 from simonlnu/master | Simon | 2012-03-28 | 2 | -2/+4 |
| | | |\ \ \ | | | | | | | | | | | | | how the default.php gets read just changed from under me. not pleasant. | ||||
| | | | | | * | really fix it this time... | Simon L'nu | 2012-03-28 | 2 | -12/+4 |
| | | | | |/ | | | |/| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | | * | | WITH is going on? | Simon L'nu | 2012-03-28 | 2 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-28 | 0 | -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' | friendica | 2012-03-28 | 28 | -157/+485 |
| | |\| | | |||||
| | | * | | Merge pull request #180 from simonlnu/master | Simon | 2012-03-28 | 2 | -11/+13 |
| | | |\ \ | | | | | | | | | | | duh... | ||||
| | | | * | | doh fix | Simon L'nu | 2012-03-28 | 2 | -11/+13 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | * | | | Merge pull request #179 from fabrixxm/master | fabrixxm | 2012-03-28 | 8 | -29/+164 |
| | | |\ \ \ | | | | |/ | | | |/| | new field_combobox template and some eyecandy to "file as" function | ||||
| | | | * | | filer: replace "file as" prompt with combobox opened in fancybox | Fabio Comuni | 2012-03-28 | 6 | -29/+145 |
| | | | | | | |||||
| | | | * | | filer: info() on item filed | Fabio Comuni | 2012-03-28 | 1 | -0/+1 |
| | | | | | | |||||
| | | | * | | template: field_combobox | Fabio Comuni | 2012-03-28 | 1 | -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/master | Simon | 2012-03-28 | 20 | -130/+321 |
| | | |\ \ \ | | | |/ / | | |/| / | | | |/ | i fixed the worst but ... | ||||
| | | | * | add some icons for the newbie stuff (diabook but 24px not 32); fixes for ↵ | Simon L'nu | 2012-03-28 | 20 | -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'nu | 2012-03-28 | 0 | -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 post | friendica | 2012-03-28 | 2 | -2/+1 |
| | |/ | |||||
| | * | support autocomplete @-tags in plaintext mode | friendica | 2012-03-28 | 2 | -0/+4 |
| | | | |||||
| | * | vier navbar messed up after default theme template move | friendica | 2012-03-28 | 1 | -0/+131 |
| | | | |||||
| | * | profile_tabs hook | friendica | 2012-03-27 | 2 | -2/+7 |
| | | | |||||
| | * | use theme directory for page templates, not language directory | friendica | 2012-03-27 | 1 | -2/+2 |
| | | | |||||
| | * | Merge branch 'pull' | friendica | 2012-03-27 | 15 | -52/+435 |
| | |\ | |||||
| | | * | small fix in diabook | tommy tomson | 2012-03-27 | 3 | -3/+3 |
| | | | | |||||
| | | * | fixes in diabook | tommy tomson | 2012-03-27 | 6 | -13/+49 |
| | | | | |||||
| | | * | Merge pull request #177 from tomtom84/master | tomtom84 | 2012-03-27 | 9 | -27/+198 |
| | | |\ | | | | | | | | | fixes in theme diabook | ||||
| | | | * | provide a close-option for boxes in right_aside and store info via js and ↵ | tommy tomson | 2012-03-27 | 9 | -27/+198 |
| | | |/ | | | | | | | | | | cookies | ||||
| | | * | Merge pull request #176 from tomtom84/master | tomtom84 | 2012-03-27 | 6 | -19/+195 |
| | | |\ | | | | | | | | | fixes in theme diabook-blue | ||||
| | | | * | provide a close-option for boxes in right_aside and store info via js and ↵ | tommy tomson | 2012-03-27 | 6 | -19/+195 |
| | | |/ | | | | | | | | | | cookies | ||||
| | * / | turn on gecko spellcheck in tinymce | friendica | 2012-03-27 | 6 | -3/+7 |
| | |/ | |||||
| | * | Merge branch 'pull' | friendica | 2012-03-27 | 6 | -115/+216 |
| | |\ | |||||
| | | * | Merge pull request #175 from simonlnu/master | Simon | 2012-03-27 | 6 | -115/+216 |
| | | |\ | | | | | | | | | various fixes for dispys | ||||
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-27 | 3 | -12/+18 |
| | | | |\ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: profile wall privacy don't expire filed items * master: | ||||
| | | | * | more fixes for dispys | Simon L'nu | 2012-03-27 | 6 | -10/+23 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | | * | add dispy-dark snapshot; fix toolbar | Simon L'nu | 2012-03-27 | 3 | -109/+197 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-27 | 10 | -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'nu | 2012-03-27 | 0 | -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 photo | friendica | 2012-03-27 | 1 | -1/+1 |
| | |/ / / | |||||
| | * | | | profile wall privacy | friendica | 2012-03-27 | 2 | -12/+13 |
| | | | | | |||||
| | * | | | Merge branch 'pull' | friendica | 2012-03-27 | 10 | -26/+42 |
| | |\ \ \ | | | |/ | | |/| | |||||
| | | * | | add "find friends" to right_aside to diabook, fixes in css in diabook | tommy tomson | 2012-03-27 | 9 | -16/+32 |
| | | | | | |||||
| | | * | | fixed Umlaute in de strings.php | Tobias Diekershoff | 2012-03-27 | 1 | -10/+10 |
| | | |/ | |||||
| | * / | don't expire filed items | friendica | 2012-03-27 | 1 | -0/+5 |
| | |/ | |||||
| | * | @-completion bug | friendica | 2012-03-26 | 1 | -5/+5 |
| | | | |||||
| | * | qcomment enhancements | friendica | 2012-03-26 | 3 | -5/+25 |
| | | | |||||
| | * | theme description with preview (non-translatable unfortunately) | friendica | 2012-03-26 | 3 | -2/+13 |
| | | | |||||
| | * | preparation for some possibly killer features | friendica | 2012-03-26 | 3 | -15/+23 |
| | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |