aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'upstream/master'Michael Vogel2012-05-2511-44/+126
|\
| * add a placeholder attribute on search-text; dispy fixesSimon L'nu2012-05-231-1/+1
| * photo rotationfriendica2012-05-231-0/+6
| * keep FB out of private notesfriendica2012-05-221-13/+17
| * clear submanage, etc from session on logoutfriendica2012-05-221-0/+7
| * cause of bogus wall-to-wall posts foundfriendica2012-05-221-1/+1
| * Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-05-222-16/+23
| |\
| | * redir links for permission controlled attachmentsfriendica2012-05-212-16/+23
| * | fix setting array values to config itemsTobias Diekershoff2012-05-221-3/+1
| |/
| * rev update, bug 428, 429, and ability to block globaldir submissions from dem...friendica2012-05-211-1/+9
| * rev updatefriendica2012-05-203-9/+61
* | Performance testsMichael Vogel2012-05-202-9/+13
* | Merge remote branch 'upstream/master'Michael Vogel2012-05-196-388/+610
|\|
| * backend support for 'x' deliveries per process - x is configurable, more impo...friendica2012-05-192-377/+388
| * theming for default group selectorfriendica2012-05-181-1/+4
| * more private forums, default privacy group for new contactsfriendica2012-05-174-30/+69
| * tell browser not to cache permission denied (private) photos so that after au...friendica2012-05-171-3/+3
| * setup delivery chain for private groups (work in progress)friendica2012-05-171-21/+26
| * bring in the *much better* xml parser from the original zot branchfriendica2012-05-161-0/+164
* | Merge remote branch 'upstream/master'Michael Vogel2012-05-166-8/+22
|\|
| * Allow plugins to modify the contact photo menuMatthew Exon2012-05-151-1/+1
| * rename get_language() to get_browser_language()friendica2012-05-132-4/+4
| * fix search/new against possible email leakagefriendica2012-05-111-0/+3
| * better test of email reply visibilityfriendica2012-05-112-3/+3
| * moderated comment templatesfriendica2012-05-111-0/+11
* | Merge remote branch 'upstream/master'Michael Vogel2012-05-0925-562/+1053
|\|
| * send browser back to correct page (with query args) after postingfriendica2012-05-091-1/+1
| * slight improvement in a couple of queriesfriendica2012-05-081-0/+6
| * don't provide 'show more' on remote friends in common unless there are actual...friendica2012-05-081-1/+2
| * make it optional to optimize the item table after expirefriendica2012-05-081-1/+5
| * finished dry run - now for real testfriendica2012-05-071-1/+3
| * don't throw "did not contain xml" error if it's a valid rss that doesn't have...friendica2012-05-071-1/+1
| * If a contact has had delivery issues in the last 15 minutes, send new posts s...friendica2012-05-074-8/+34
| * separate poll_interval from delivery_interval - default is the same.friendica2012-05-071-1/+3
| * reset permissions to forum default when adding forum delivery chainfriendica2012-05-061-2/+12
| * consolidate item deletion so we can fix orphaned categories and file_as tags.friendica2012-05-051-27/+32
| * workaround to clean up orphaned filetagsfriendica2012-05-041-1/+1
| * only show remove category to item ownerfriendica2012-05-041-1/+2
| * category removalfriendica2012-05-041-4/+9
| * "show more" friends in commonfriendica2012-05-042-7/+13
| * implement max load average before queuing/deferring delivery and poller proce...friendica2012-05-032-0/+24
| * yet another bug in remote_friends_in_commonfriendica2012-05-032-1/+2
| * string updatefriendica2012-05-031-1/+3
| * validate_url() and validate_email() validate also IP address.Fabio Comuni2012-05-031-3/+3
| * use mysql replace on cache itemsfriendica2012-05-021-12/+30
| * fixing common friendsfriendica2012-05-021-6/+7
| * missing paramfriendica2012-05-021-1/+2
| * how did that happen?friendica2012-05-021-1/+1
| * shuffle results of remote_common_friends widgetfriendica2012-05-022-8/+25
| * only validate oncefriendica2012-05-011-3/+0