aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* tweaking stuff in dispys. i thought i fixed the login screens, but they're ↵Simon L'nu2012-03-296-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'nu2012-03-292-4/+3
|\ | | | | | | | | | | | | * remotes/upstream/master: typo in function name * master:
| * typo in function namefriendica2012-03-292-4/+3
| |
* | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-2931-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.0friendica2012-03-292-1/+8
| |
| * css fixes in diabook-derivatestommy tomson2012-03-2916-23/+136
| |
| * Merge pull request #185 from fabrixxm/masterfabrixxm2012-03-2813-111/+513
| |\ | | | | | | Updated private message pages
| | * quattro: style pm pagesFabio Comuni2012-03-288-64/+405
| | |
| | * message: remove tabs, move new message link to aside, all message with ↵Fabio Comuni2012-03-284-47/+96
| | | | | | | | | | | | gmail-style
| | * Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-03-2822-130/+316
| | |\
| | * | quattro: tpl for "file as"Fabio Comuni2012-03-281-0/+12
| | | |
* | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-290-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 upfriendica2012-03-283-8/+11
| | |
* | | Merge branch 'pull'friendica2012-03-2810-78/+317
|\ \ \
| * \ \ Merge pull request #184 from annando/masterfriendica2012-03-2810-78/+317
| |\ \ \ | | | | | | | | | | Enhancing the API - Preparations for a better facebook export
| | * \ \ Merge commit 'upstream/master'Michael Vogel2012-03-28598-11992/+36509
| | |\ \ \ | | | | |/ | | | |/|
| | * | | New parameter in html2plain for plain text exports. More compatibility in APIMichael Vogel2012-03-212-17/+83
| | | | |
| | * | | API: added max_idMichael Vogel2012-03-181-2/+6
| | | | |
| | * | | API: Now threading seems to workMichael Vogel2012-03-181-4/+12
| | | | |
| | * | | API: Seesmic is now working. Optimizing text export.Michael Vogel2012-03-184-59/+164
| | | | |
| | * | | Quotes with author are now having an "open/close" linkMichael Vogel2012-03-172-3/+25
| | | | |
| | * | | New bbcode element: "spoiler". Mail: Top post quotes are now embraced in ↵Michael Vogel2012-03-176-5/+39
| | | | | | | | | | | | | | | | | | | | "spoiler" elements
* | | | | network permission idsfriendica2012-03-281-1/+23
| | | | |
* | | | | wrong var for notify totalfriendica2012-03-281-1/+1
| | | | |
* | | | | fix notification totalfriendica2012-03-281-2/+3
| | | | |
* | | | | improved rw notificationsfriendica2012-03-282-2/+28
|/ / / /
* | | | Merge branch 'pull'friendica2012-03-2812-22/+108
|\ \ \ \
| * | | | add a searchbox to "find friends" for global searchtommy tomson2012-03-288-9/+70
| | | | |
| * | | | bugfix in diabooktommy tomson2012-03-285-13/+38
| | |/ / | |/| |
* / | | bug #349 - email notls settingfriendica2012-03-282-2/+2
|/ / /
* | | 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
|/ /