Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-29 | 4 | -68/+110 |
|\ | | | | | | | | | Conflicts: mod/search.php | ||||
| * | Merge pull request #316 from annando/master | Simon | 2012-05-29 | 3 | -62/+99 |
| |\ | | | | | | | Speed improvements | ||||
| | * | Disabled logging of SQL statements | Michael Vogel | 2012-05-29 | 1 | -4/+4 |
| | | | |||||
| | * | Merge remote branch 'upstream/master' | Michael Vogel | 2012-05-29 | 8 | -16/+109 |
| | |\ | |||||
| | * | | Doing negative caching for config values, special logfile for database ↵ | Michael Vogel | 2012-05-26 | 2 | -4/+26 |
| | | | | | | | | | | | | | | | | optmisations | ||||
| | * | | Deactivating the test output in db engine | Michael Vogel | 2012-05-26 | 1 | -2/+2 |
| | | | | |||||
| | * | | Speed optimisation by enabling the posibility of the MySQL fulltext engine | Michael Vogel | 2012-05-26 | 2 | -8/+16 |
| | | | | |||||
| | * | | Merge remote branch 'upstream/master' | Michael Vogel | 2012-05-25 | 11 | -44/+126 |
| | |\ \ | |||||
| | * | | | Performance tests | Michael Vogel | 2012-05-20 | 2 | -9/+13 |
| | | | | | |||||
| | * | | | Merge remote branch 'upstream/master' | Michael Vogel | 2012-05-19 | 6 | -388/+610 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge remote branch 'upstream/master' | Michael Vogel | 2012-05-16 | 6 | -8/+22 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge remote branch 'upstream/master' | Michael Vogel | 2012-05-09 | 25 | -562/+1053 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | API: RSS-Feeds are now shortened to 1000 characters. (With added link) | Michael Vogel | 2012-04-22 | 1 | -45/+48 |
| | | | | | | | | |||||
| * | | | | | | | Add two hooks, event_created and event_updated. One Bugfix for the ↵ | Tobias Hößl | 2012-05-29 | 1 | -6/+11 |
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | <id>...</id> tag ($uri was never defined). Commented out the parse_event() function - its never called and would lead to a program abortion due to a broken require_once at the beginning | ||||
* / | | | | | | bugfixes: private photo embeds and search for strings with % | friendica | 2012-05-29 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | ability to only expire contacts, not self | friendica | 2012-05-29 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Provide backend option to only expire other peoples' conversations. | friendica | 2012-05-28 | 1 | -1/+8 |
| | | | | | | |||||
* | | | | | | rev update | friendica | 2012-05-28 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | add plugin hooks to gender, sexpref, and marital selectors | friendica | 2012-05-27 | 1 | -0/+7 |
| | | | | | | |||||
* | | | | | | birthday in november,december bug | friendica | 2012-05-27 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | rework the way private photos are embedded to avoid url differences and also ↵ | friendica | 2012-05-27 | 3 | -10/+82 |
| | | | | | | | | | | | | | | | | | | | | | | | | check the permissions if possible to make sure that nothing sneaks by. | ||||
* | | | | | | handle multiple underscores in D* links | friendica | 2012-05-26 | 2 | -1/+8 |
| | | | | | | |||||
* | | | | | | allow force ssl on notifications | friendica | 2012-05-26 | 1 | -1/+1 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | add a placeholder attribute on search-text; dispy fixes | Simon L'nu | 2012-05-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | | | | photo rotation | friendica | 2012-05-23 | 1 | -0/+6 |
| | | | | | |||||
* | | | | | keep FB out of private notes | friendica | 2012-05-22 | 1 | -13/+17 |
| | | | | | |||||
* | | | | | clear submanage, etc from session on logout | friendica | 2012-05-22 | 1 | -0/+7 |
| | | | | | |||||
* | | | | | cause of bogus wall-to-wall posts found | friendica | 2012-05-22 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-05-22 | 2 | -16/+23 |
|\ \ \ \ \ | |||||
| * | | | | | redir links for permission controlled attachments | friendica | 2012-05-21 | 2 | -16/+23 |
| | | | | | | |||||
* | | | | | | fix setting array values to config items | Tobias Diekershoff | 2012-05-22 | 1 | -3/+1 |
|/ / / / / | |||||
* | | | | | rev update, bug 428, 429, and ability to block globaldir submissions from ↵ | friendica | 2012-05-21 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | demo sites | ||||
* | | | | | rev update | friendica | 2012-05-20 | 3 | -9/+61 |
| |_|_|/ |/| | | | |||||
* | | | | backend support for 'x' deliveries per process - x is configurable, more ↵ | friendica | 2012-05-19 | 2 | -377/+388 |
| | | | | | | | | | | | | | | | | importantly any search starting with # is automatically a tag search. TODO: Need to extend this to people searches starting with @ | ||||
* | | | | theming for default group selector | friendica | 2012-05-18 | 1 | -1/+4 |
| | | | | |||||
* | | | | more private forums, default privacy group for new contacts | friendica | 2012-05-17 | 4 | -30/+69 |
| | | | | |||||
* | | | | tell browser not to cache permission denied (private) photos so that after ↵ | friendica | 2012-05-17 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | authenticating we don't have to fight the browser - plus more prvgroup work | ||||
* | | | | setup delivery chain for private groups (work in progress) | friendica | 2012-05-17 | 1 | -21/+26 |
| | | | | |||||
* | | | | bring in the *much better* xml parser from the original zot branch | friendica | 2012-05-16 | 1 | -0/+164 |
| |_|/ |/| | | |||||
* | | | Allow plugins to modify the contact photo menu | Matthew Exon | 2012-05-15 | 1 | -1/+1 |
| | | | |||||
* | | | rename get_language() to get_browser_language() | friendica | 2012-05-13 | 2 | -4/+4 |
| | | | |||||
* | | | fix search/new against possible email leakage | friendica | 2012-05-11 | 1 | -0/+3 |
| | | | |||||
* | | | better test of email reply visibility | friendica | 2012-05-11 | 2 | -3/+3 |
| | | | |||||
* | | | moderated comment templates | friendica | 2012-05-11 | 1 | -0/+11 |
| |/ |/| | |||||
* | | send browser back to correct page (with query args) after posting | friendica | 2012-05-09 | 1 | -1/+1 |
| | | |||||
* | | slight improvement in a couple of queries | friendica | 2012-05-08 | 1 | -0/+6 |
| | | |||||
* | | don't provide 'show more' on remote friends in common unless there are ↵ | friendica | 2012-05-08 | 1 | -1/+2 |
| | | | | | | | | actually more | ||||
* | | make it optional to optimize the item table after expire | friendica | 2012-05-08 | 1 | -1/+5 |
| | | |||||
* | | finished dry run - now for real test | friendica | 2012-05-07 | 1 | -1/+3 |
| | | |||||
* | | don't throw "did not contain xml" error if it's a valid rss that doesn't ↵ | friendica | 2012-05-07 | 1 | -1/+1 |
| | | | | | | | | have the <?xml declaration |