Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/friendica/friendica | Alexander Kampmann | 2012-04-05 | 55 | -150/+837 |
|\ | | | | | | | | | | | Conflicts: include/config.php update.php | ||||
| * | also block outbound | friendica | 2012-04-04 | 1 | -0/+5 |
| | | |||||
| * | log disabled requests | friendica | 2012-04-04 | 1 | -2/+6 |
| | | |||||
| * | fix config storage of booleans | friendica | 2012-04-04 | 1 | -0/+1 |
| | | |||||
| * | bug: diaspora_enabled setting turns it on but doesn't fully turn it off. | friendica | 2012-04-04 | 1 | -0/+8 |
| | | |||||
| * | make contact ssl_policy change a function since it is used in a few places | friendica | 2012-04-02 | 3 | -86/+50 |
| | | |||||
| * | more ssl policy fixes and prevent delivery to soapbox when using local delivery | friendica | 2012-04-02 | 2 | -0/+100 |
| | | |||||
| * | remove zrl from query string | friendica | 2012-04-02 | 1 | -0/+3 |
| | | |||||
| * | catch a couple more Oo smilies | friendica | 2012-04-01 | 1 | -0/+4 |
| | | |||||
| * | add title to D* posts | friendica | 2012-04-01 | 1 | -1/+5 |
| | | |||||
| * | allow users to set categories on their posts | Michael Johnston | 2012-04-01 | 3 | -0/+142 |
| | | |||||
| * | slight improvement in handling of plaintext feeds | friendica | 2012-04-01 | 1 | -2/+9 |
| | | |||||
| * | that didn't quite work out | friendica | 2012-04-01 | 1 | -2/+2 |
| | | |||||
| * | try slightly better detection of html in feeds | friendica | 2012-04-01 | 1 | -3/+4 |
| | | |||||
| * | Merge branch 'pull' | friendica | 2012-04-01 | 1 | -1/+1 |
| |\ | |||||
| | * | line 86: s/Friendika/Friendica/ | Simon | 2012-04-01 | 1 | -1/+1 |
| | | | |||||
| * | | send unverified private mail using zrl | friendica | 2012-04-01 | 1 | -0/+85 |
| |/ | |||||
| * | more error handling | friendica | 2012-03-31 | 2 | -1/+4 |
| | | |||||
| * | handle escaped file chars in display and search | friendica | 2012-03-31 | 2 | -8/+5 |
| | | |||||
| * | escape % in file_tag_query as it is ultimately embedded in a sprintf | friendica | 2012-03-31 | 1 | -0/+4 |
| | | |||||
| * | warning cleanup | friendica | 2012-03-30 | 1 | -1/+0 |
| | | |||||
| * | catch OpenID login errors in cases when the OpenID server does not answers | Tobias Diekershoff | 2012-03-30 | 1 | -1/+5 |
| | | |||||
| * | rename "file as" to "save to folder" | friendica | 2012-03-30 | 2 | -3/+3 |
| | | |||||
| * | bug #352 - qcomment plugin disabled, qcomments still allowed | friendica | 2012-03-30 | 1 | -2/+5 |
| | | |||||
| * | another silly mistake | friendica | 2012-03-29 | 1 | -3/+3 |
| | | |||||
| * | silly mistake | friendica | 2012-03-29 | 1 | -2/+3 |
| | | |||||
| * | zrl on mentions | friendica | 2012-03-29 | 1 | -0/+6 |
| | | |||||
| * | use zrl to get home again | friendica | 2012-03-29 | 4 | -17/+31 |
| | | |||||
| * | typo in function name | friendica | 2012-03-29 | 1 | -3/+2 |
| | | |||||
| * | some reported warnings cleaned up | friendica | 2012-03-28 | 3 | -8/+11 |
| | | |||||
| * | Merge branch 'pull' | friendica | 2012-03-28 | 8 | -73/+311 |
| |\ | |||||
| | * | Merge commit 'upstream/master' | Michael Vogel | 2012-03-28 | 24 | -128/+282 |
| | |\ | |||||
| | * | | 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 | 2 | -54/+158 |
| | | | | |||||
| | * | | 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 | ||||
| * | | | improved rw notifications | friendica | 2012-03-28 | 1 | -0/+11 |
| | |/ | |/| | |||||
| * | | filer: info() on item filed | Fabio Comuni | 2012-03-28 | 1 | -0/+1 |
| | | | |||||
| * | | profile_tabs hook | friendica | 2012-03-27 | 1 | -1/+1 |
| | | | |||||
| * | | don't expire filed items | friendica | 2012-03-27 | 1 | -0/+5 |
| | | | |||||
| * | | theme description with preview (non-translatable unfortunately) | friendica | 2012-03-26 | 1 | -0/+1 |
| | | | |||||
| * | | preparation for some possibly killer features | friendica | 2012-03-26 | 1 | -6/+4 |
| | | | |||||
| * | | language issues in enotify | friendica | 2012-03-26 | 1 | -5/+9 |
| | | | |||||
| * | | don't include friend suggestions for people with the same name as current ↵ | friendica | 2012-03-25 | 1 | -2/+6 |
| | | | | | | | | | | | | contacts. This will remove a lot of #whoaretonybaldwin. | ||||
| * | | theme screenshots | friendica | 2012-03-25 | 1 | -0/+10 |
| | | | |||||
| * | | enotify plugin hook | friendica | 2012-03-25 | 1 | -2/+24 |
| | | | |||||
| * | | NOTIFY_SYSTEM | friendica | 2012-03-25 | 1 | -1/+6 |
| | | | |||||
| * | | improved the inivitations and added a bit of sales pitch. | friendica | 2012-03-24 | 1 | -3/+1 |
| | | |