| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | tweaking stuff in dispys. i thought i fixed the login screens, but they're ↵ | Simon L'nu | 2012-03-29 | 6 | -58/+44 |
| | | | | | | | b0rked right now. Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-29 | 2 | -4/+3 |
| |\ | | | | | | | | | | | | | * remotes/upstream/master: typo in function name * master: | ||||
| | * | typo in function name | friendica | 2012-03-29 | 2 | -4/+3 |
| | | | |||||
| * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-29 | 31 | -135/+657 |
| |\| | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: theme file_as combobox for 2.0 css fixes in diabook-derivates quattro: style pm pages message: remove tabs, move new message link to aside, all message with gmail-style quattro: tpl for "file as" * master: | ||||
| | * | theme file_as combobox for 2.0 | friendica | 2012-03-29 | 2 | -1/+8 |
| | | | |||||
| | * | css fixes in diabook-derivates | tommy tomson | 2012-03-29 | 16 | -23/+136 |
| | | | |||||
| | * | Merge pull request #185 from fabrixxm/master | fabrixxm | 2012-03-28 | 13 | -111/+513 |
| | |\ | | | | | | | Updated private message pages | ||||
| | | * | quattro: style pm pages | Fabio Comuni | 2012-03-28 | 8 | -64/+405 |
| | | | | |||||
| | | * | message: remove tabs, move new message link to aside, all message with ↵ | Fabio Comuni | 2012-03-28 | 4 | -47/+96 |
| | | | | | | | | | | | | | gmail-style | ||||
| | | * | Merge remote-tracking branch 'friendica/master' | Fabio Comuni | 2012-03-28 | 22 | -130/+316 |
| | | |\ | |||||
| | | * | | quattro: tpl for "file as" | Fabio Comuni | 2012-03-28 | 1 | -0/+12 |
| | | | | | |||||
| * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-29 | 0 | -0/+0 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: some reported warnings cleaned up network permission ids wrong var for notify total fix notification total improved rw notifications bug #349 - email notls setting add a searchbox to "find friends" for global search bugfix in diabook title not updated when editing post New parameter in html2plain for plain text exports. More compatibility in API API: added max_id API: Now threading seems to work API: Seesmic is now working. Optimizing text export. Quotes with author are now having an "open/close" link New bbcode element: "spoiler". Mail: Top post quotes are now embraced in "spoiler" elements * master: | ||||
| * | | | some reported warnings cleaned up | friendica | 2012-03-28 | 3 | -8/+11 |
| | | | | |||||
| * | | | Merge branch 'pull' | friendica | 2012-03-28 | 10 | -78/+317 |
| |\ \ \ | |||||
| | * \ \ | Merge pull request #184 from annando/master | friendica | 2012-03-28 | 10 | -78/+317 |
| | |\ \ \ | | | | | | | | | | | Enhancing the API - Preparations for a better facebook export | ||||
| | | * \ \ | Merge commit 'upstream/master' | Michael Vogel | 2012-03-28 | 598 | -11992/+36509 |
| | | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | | New parameter in html2plain for plain text exports. More compatibility in API | Michael Vogel | 2012-03-21 | 2 | -17/+83 |
| | | | | | | |||||
| | | * | | | API: added max_id | Michael Vogel | 2012-03-18 | 1 | -2/+6 |
| | | | | | | |||||
| | | * | | | API: Now threading seems to work | Michael Vogel | 2012-03-18 | 1 | -4/+12 |
| | | | | | | |||||
| | | * | | | API: Seesmic is now working. Optimizing text export. | Michael Vogel | 2012-03-18 | 4 | -59/+164 |
| | | | | | | |||||
| | | * | | | Quotes with author are now having an "open/close" link | Michael Vogel | 2012-03-17 | 2 | -3/+25 |
| | | | | | | |||||
| | | * | | | New bbcode element: "spoiler". Mail: Top post quotes are now embraced in ↵ | Michael Vogel | 2012-03-17 | 6 | -5/+39 |
| | | | | | | | | | | | | | | | | | | | | | "spoiler" elements | ||||
| * | | | | | network permission ids | friendica | 2012-03-28 | 1 | -1/+23 |
| | | | | | | |||||
| * | | | | | wrong var for notify total | friendica | 2012-03-28 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | fix notification total | friendica | 2012-03-28 | 1 | -2/+3 |
| | | | | | | |||||
| * | | | | | improved rw notifications | friendica | 2012-03-28 | 2 | -2/+28 |
| |/ / / / | |||||
| * | | | | Merge branch 'pull' | friendica | 2012-03-28 | 12 | -22/+108 |
| |\ \ \ \ | |||||
| | * | | | | add a searchbox to "find friends" for global search | tommy tomson | 2012-03-28 | 8 | -9/+70 |
| | | | | | | |||||
| | * | | | | bugfix in diabook | tommy tomson | 2012-03-28 | 5 | -13/+38 |
| | | |/ / | |/| | | |||||
| * / | | | bug #349 - email notls setting | friendica | 2012-03-28 | 2 | -2/+2 |
| |/ / / | |||||
| * | | | 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 |
| |/ / | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |