aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pull'friendica2012-03-2810-78/+317
|\
| * Merge pull request #184 from annando/masterfriendica2012-03-2810-78/+317
| |\
| | * 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 "spo...Michael Vogel2012-03-176-5/+39
* | | | 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
| |\ \
| | * \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-282-1/+10
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #182 from fabrixxm/masterfabrixxm2012-03-282-1/+10
| |\ \ \
| | * | | 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
| |\ \ \ \
| | | | * | really fix it this time...Simon L'nu2012-03-282-12/+4
| | | |/ / | | |/| |
| | * | | WITH is going on?Simon L'nu2012-03-282-2/+4
| | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-280-0/+0
| |/ / /
* | | | Merge branch 'pull'friendica2012-03-2828-157/+485
|\| | |
| * | | Merge pull request #180 from simonlnu/masterSimon2012-03-282-11/+13
| |\ \ \
| | * | | doh fixSimon L'nu2012-03-282-11/+13
| * | | | Merge pull request #179 from fabrixxm/masterfabrixxm2012-03-288-29/+164
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | 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
| * | | | Merge pull request #178 from simonlnu/masterSimon2012-03-2820-130/+321
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | add some icons for the newbie stuff (diabook but 24px not 32); fixes for disp...Simon L'nu2012-03-2820-130/+321
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-280-0/+0
| |/ /
* / / 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
| |\ \
| | * | provide a close-option for boxes in right_aside and store info via js and coo...tommy tomson2012-03-279-27/+198
| |/ /
| * | Merge pull request #176 from tomtom84/mastertomtom842012-03-276-19/+195
| |\ \
| | * | provide a close-option for boxes in right_aside and store info via js and coo...tommy tomson2012-03-276-19/+195
| |/ /
* / / turn on gecko spellcheck in tinymcefriendica2012-03-276-3/+7
|/ /
* | Merge branch 'pull'friendica2012-03-276-115/+216
|\ \