Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Merge branch 'master' of git://github.com/friendica/friendica | Alexander Kampmann | 2012-03-14 | 5 | -15/+43 | |
| |\ | | | | | | | | | | | | | Conflicts: view/de/strings.php | |||||
| * | | get_tags tests corrected. They test for the right things now. | Alexander Kampmann | 2012-03-14 | 1 | -6/+7 | |
| | | | ||||||
| * | | get tags test improved | Alexander Kampmann | 2012-03-12 | 1 | -24/+55 | |
| | | | ||||||
| * | | splitted test cases. | Alexander Kampmann | 2012-03-09 | 1 | -104/+108 | |
| | | | ||||||
* | | | Merge branch 'pull' | friendica | 2012-03-14 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * \ \ | Merge https://github.com/friendica/friendica into pull | friendica | 2012-03-14 | 1 | -1/+1 | |
| |\ \ \ | ||||||
| | * | | | PHP Fatal error: Call-time pass-by-reference has been removed in ↵ | Simon L'nu | 2012-03-14 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod/item.php on line 630 Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | |||||
* | | | | | addon settings form error | friendica | 2012-03-13 | 2 | -2/+2 | |
|/ / / / | ||||||
* / / / | more work on filer, comment level and file tag removal | friendica | 2012-03-13 | 1 | -0/+21 | |
|/ / / | ||||||
* | | | sort inbox by recently replied conversations first | friendica | 2012-03-13 | 1 | -1/+1 | |
| | | | ||||||
* | | | file as widget and basic filing implementation for duepuntozero,slackr | friendica | 2012-03-13 | 2 | -0/+24 | |
| | | | | | | | | | | | | much more work needed - this is just for test/evaluation currently | |||||
* | | | don't count self in number of contatcs | friendica | 2012-03-13 | 1 | -4/+2 | |
| | | | ||||||
* | | | Merge branch 'pull' | friendica | 2012-03-13 | 7 | -42/+83 | |
|\ \ \ | ||||||
| * | | | Some security against XSRF-attacks | Tobias Hößl | 2012-03-12 | 3 | -33/+72 | |
| | | | | ||||||
| * | | | Merge branch 'master' of git://github.com/friendica/friendica | Tobias Hößl | 2012-03-12 | 3 | -9/+16 | |
| |\ \ \ | | | |/ | | |/| | ||||||
| * | | | Merge branch 'master' of git://github.com/friendica/friendica | Tobias Hößl | 2012-03-11 | 4 | -9/+31 | |
| |\ \ \ | ||||||
| * \ \ \ | Merge branch 'master' of git://github.com/friendica/friendica | Tobias Hößl | 2012-03-09 | 11 | -100/+149 | |
| |\ \ \ \ | ||||||
| * | | | | | A 'PHP Fatal error: Call to a member function getElementsByTagName() on a ↵ | Tobias Hößl | 2012-03-03 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | non-object in mod/parse_url.php on line 191' occurred when the linked HTML-File doesn't have a HEAD. The HTML-file couln't be link to in the editor therefore. | |||||
| * | | | | | Mostly some checks in order to avoid Notices; 1 real bugfix in /mod/network.php | Tobias Hößl | 2012-02-28 | 1 | -6/+8 | |
| | | | | | | ||||||
| * | | | | | Merge remote branch 'upstream/master' | Tobias Hößl | 2012-02-28 | 5 | -27/+43 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | Avoid notices | Tobias Hößl | 2012-02-28 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | contact.network is used later to check if a direct link or a redirect by ↵ | Tobias Hößl | 2012-02-28 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | /redir/contactid should be used | |||||
* | | | | | | | invite potential connectees to the free social web | friendica | 2012-03-13 | 1 | -1/+7 | |
| |_|_|_|/ / |/| | | | | | ||||||
* | | | | | | backend for "save to file" feature | friendica | 2012-03-11 | 1 | -7/+14 | |
| | | | | | | ||||||
* | | | | | | community meta tag renamed from "ika" | friendica | 2012-03-11 | 2 | -2/+2 | |
| |_|_|/ / |/| | | | | ||||||
* | | | | | default the text template var on conversations | friendica | 2012-03-10 | 1 | -0/+1 | |
| | | | | | ||||||
* | | | | | bug #327 - composed private message is lost if no recip specified. | friendica | 2012-03-10 | 1 | -5/+15 | |
| | | | | | ||||||
* | | | | | allow user to set number of items to show on network page | Michael Johnston | 2012-03-09 | 2 | -1/+11 | |
| |_|_|/ |/| | | | ||||||
* | | | | recover contacts total count which got lost | friendica | 2012-03-09 | 1 | -3/+4 | |
| |_|/ |/| | | ||||||
* | | | bug #324 - tinymce used for mail even if editplain being used. | friendica | 2012-03-09 | 1 | -0/+6 | |
| | | | ||||||
* | | | reworked fix from unary for bug #323 (due to incorrect use of ↵ | friendica | 2012-03-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | array_key_exists()) | |||||
* | | | fix photos after permissions_sql change | friendica | 2012-03-06 | 2 | -2/+2 | |
| | | | ||||||
* | | | [privacy] rework latest fix | friendica | 2012-03-06 | 1 | -3/+0 | |
| | | | ||||||
* | | | remove stray debugging | friendica | 2012-03-06 | 1 | -2/+2 | |
| | | | ||||||
* | | | fix html reshares when editplain in use | friendica | 2012-03-06 | 1 | -5/+13 | |
| | | | ||||||
* | | | search should be ok, but a little extra security won't hurt | friendica | 2012-03-06 | 1 | -1/+1 | |
| | | | ||||||
* | | | [PRIVACY] privacy issue bug #314 | friendica | 2012-03-06 | 1 | -2/+5 | |
| | | | ||||||
* | | | bugs #312, #313 | friendica | 2012-03-06 | 2 | -35/+33 | |
| | | | ||||||
* | | | some admin page fixes and cleanup | friendica | 2012-03-05 | 1 | -3/+7 | |
| | | | ||||||
* | | | group: fix create new group form | Fabio Comuni | 2012-03-02 | 1 | -0/+1 | |
| | | | ||||||
* | | | Merge remote-tracking branch 'friendica/master' into randomerror | Fabio Comuni | 2012-03-01 | 2 | -4/+25 | |
|\ \ \ | ||||||
| * | | | notification enhancements | friendica | 2012-02-29 | 1 | -1/+3 | |
| | | | | ||||||
| * | | | better handling of multiple notifications for same item, and old notifications | friendica | 2012-02-29 | 2 | -4/+23 | |
| | | | | ||||||
* | | | | admin: fix small string | Fabio Comuni | 2012-03-01 | 1 | -2/+5 | |
| | | | | ||||||
* | | | | Merge remote-tracking branch 'friendica/master' into randomerror | Fabio Comuni | 2012-02-29 | 16 | -193/+432 | |
|\| | | | ||||||
| * | | | cleaned up mess created when both people request friendship and one approves ↵ | friendica | 2012-02-28 | 1 | -1/+11 | |
| | | | | | | | | | | | | | | | | as duplex | |||||
| * | | | Merge branch 'pull' | friendica | 2012-02-28 | 1 | -1/+2 | |
| |\ \ \ | | | |/ | | |/| | ||||||
| | * | | fix url and network display | fabrixxm | 2012-02-28 | 1 | -1/+2 | |
| | | | | ||||||
| * | | | From Tobias H - catch some irregularities caused by cut/paste code | friendica | 2012-02-28 | 2 | -5/+5 | |
| |/ / | ||||||
| * | | update globaldir when page-type changes, add spam date field | friendica | 2012-02-27 | 1 | -1/+3 | |
| | | |