Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #149 from CatoTH/master | Simon | 2012-03-19 | 1 | -1/+1 |
|\ | | | | | Add a missing security token [Using photos as profile photos] | ||||
| * | Existing photos could not be used as profile photos anymore - should be ↵ | Tobias Hößl | 2012-03-19 | 1 | -1/+1 |
| | | | | | | | | fixed now. And some extra logging in the CSRF-Protection to make debugging easier | ||||
* | | community discovery cont., cleanup of DB debugging | friendica | 2012-03-18 | 1 | -3/+3 |
|/ | |||||
* | CSRF-Protection in the group-related form (creating, renaming and dropping a ↵ | Tobias Hößl | 2012-03-18 | 1 | -7/+19 |
| | | | | group, adding/removing members from it) | ||||
* | remove admin view of local directory | friendica | 2012-03-17 | 1 | -15/+2 |
| | |||||
* | template processor broken with foreach k=>v and k is integer 0 | friendica | 2012-03-17 | 1 | -2/+2 |
| | |||||
* | cut/paste error | friendica | 2012-03-17 | 1 | -1/+1 |
| | |||||
* | make auto-complete work in more places | Simon L'nu | 2012-03-16 | 1 | -1/+9 |
| | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | convert boolean or int settings to strings to work around issues with ↵ | friendica | 2012-03-16 | 1 | -7/+7 |
| | | | | template processing | ||||
* | Merge pull request #141 from CatoTH/master | Simon | 2012-03-16 | 1 | -1/+1 |
|\ | | | | | Private messages - tabindex | ||||
| * | Use tabindex to enable easy navigation in the dialog to write private mails; ↵ | Tobias Hößl | 2012-03-16 | 1 | -1/+1 |
| | | | | | | | | Recipient -> Subject -> Text field (tabindex has to be set to the IFRAME element after TinyMCE started) -> Send button | ||||
* | | syntax error from pasted text, remove ^M's | friendica | 2012-03-16 | 1 | -96/+96 |
| | | |||||
* | | bug #335 network search broken after new ssl policy settings | friendica | 2012-03-16 | 1 | -1/+1 |
|/ | |||||
* | track whether contact is a community page or not | friendica | 2012-03-15 | 2 | -4/+14 |
| | |||||
* | more recycle fixes for plaintext | friendica | 2012-03-15 | 1 | -1/+1 |
| | |||||
* | fix recycle symbol when using plaintext editor | friendica | 2012-03-15 | 1 | -1/+1 |
| | |||||
* | don't allow multiple friends with http/https same person, don't show mail2 ↵ | friendica | 2012-03-14 | 1 | -3/+18 |
| | | | | coming soon unless person is allowed to have email contacts | ||||
* | basic ssl_policy for important modules | friendica | 2012-03-14 | 9 | -110/+112 |
| | |||||
* | ssl_policy stuff | friendica | 2012-03-14 | 2 | -7/+70 |
| | |||||
* | Merge pull request #132 from campino/master | friendica | 2012-03-14 | 1 | -104/+140 |
|\ | | | | | Test cases | ||||
| * | 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 |
| | | |