Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | cherry pick pull request #544 | friendica | 2014-07-24 | 6 | -68/+15 |
| | |||||
* | Merge branch 'master' of https://github.com/RedMatrixCanada/red into ↵ | friendica | 2014-07-24 | 22 | -5992/+6892 |
|\ | | | | | | | RedMatrixCanada-master | ||||
| * | French Translations | mycocham | 2014-07-24 | 22 | -5992/+6892 |
| | | |||||
* | | issues #542 #543 - mentions not linked on editing a post if they contained a ↵ | friendica | 2014-07-24 | 1 | -0/+9 |
| | | | | | | | | forum indicator. | ||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-07-24 | 8 | -1026/+1680 |
|\| | |||||
| * | update to bootstrap-3.2 and minor css adjustments | marijus | 2014-07-24 | 8 | -1026/+1680 |
| | | |||||
* | | add an encoding type to formatted zot communication structures so that we ↵ | friendica | 2014-07-24 | 4 | -6/+5 |
|/ | | | | can later add alternate encodings. | ||||
* | allow jotnets to work with rpost | friendica | 2014-07-23 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of https://github.com/mrjive/red into mrjive-master | friendica | 2014-07-23 | 1 | -1/+1 |
|\ | | | | | | | | | Conflicts: view/it/messages.po | ||||
| * | Just a small typo | mrjive | 2014-07-24 | 1 | -1/+1 |
| | | | | | | Fixed a small typo (and also to try if I'm doing right) | ||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-07-23 | 2 | -1095/+1154 |
|\ \ | |||||
| * \ | Merge branch 'master' of https://github.com/friendica/red | Jeroen | 2014-07-23 | 6 | -25/+122 |
| |\ \ | |||||
| * | | | update nl | Jeroen | 2014-07-23 | 2 | -1095/+1154 |
| | | | | |||||
* | | | | rev update | friendica | 2014-07-23 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | some backend JS support for an endless scroll directory | friendica | 2014-07-22 | 1 | -3/+68 |
| | | | |||||
* | | | standards compliance | friendica | 2014-07-22 | 1 | -6/+6 |
| | | | |||||
* | | | when telling somebody that permissions have changed but not yet submitted, ↵ | friendica | 2014-07-22 | 3 | -16/+24 |
| | | | | | | | | | | | | give them a submit button *right there* so they don't have to look for it. | ||||
* | | | add another important note | friendica | 2014-07-22 | 1 | -0/+2 |
| | | | |||||
* | | | provide ability to blacklist sites from "Discover". | friendica | 2014-07-22 | 1 | -0/+22 |
|/ / | |||||
* | | sql string unquoted | friendica | 2014-07-22 | 2 | -2/+2 |
| | | |||||
* | | paranoia tweaks | friendica | 2014-07-21 | 1 | -2/+6 |
| | | |||||
* | | the "page 2 shows up on top of page 1 when you wake up in the morning" bug. ↵ | friendica | 2014-07-21 | 2 | -1/+18 |
| | | | | | | | | See the comments. | ||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-07-20 | 12 | -5961/+6200 |
|\ \ | |||||
| * \ | Merge pull request #539 from tuscanhobbit/master | Paolo T | 2014-07-19 | 12 | -5961/+6200 |
| |\ \ | | |/ | |/| | IT: updated strings | ||||
| | * | IT: updated strings | tuscanhobbit | 2014-07-19 | 12 | -5961/+6200 |
| |/ | |||||
* | | add more control to auth paranoia setting | friendica | 2014-07-20 | 3 | -761/+822 |
| | | |||||
* | | doc updates | friendica | 2014-07-20 | 92 | -960/+1625 |
| | | |||||
* | | correct the permissions on profile page | friendica | 2014-07-17 | 1 | -1/+1 |
|/ | |||||
* | ensure that we don't have permission settings issues due to version skew ↵ | friendica | 2014-07-17 | 1 | -1/+1 |
| | | | | across sites. | ||||
* | provide a specific permission for liking profiles (reuse the obsolete ↵ | friendica | 2014-07-17 | 9 | -28/+56 |
| | | | | bookmark permission), also remove the unused 'unconnected contacts' view for now. | ||||
* | better handling of interactive likes | friendica | 2014-07-17 | 2 | -14/+19 |
| | |||||
* | confirm that something was done. | friendica | 2014-07-17 | 1 | -0/+8 |
| | |||||
* | make mod_like interactive if requested | friendica | 2014-07-17 | 2 | -10/+44 |
| | |||||
* | collection sync issue | friendica | 2014-07-17 | 1 | -0/+25 |
| | |||||
* | tinmymce zombie - kill it. | friendica | 2014-07-17 | 2 | -3/+3 |
| | |||||
* | don't subdue archived connections in viewconnections | friendica | 2014-07-16 | 2 | -3/+5 |
| | |||||
* | subdue archived connections in group editor and don't show at all in ↵ | friendica | 2014-07-16 | 2 | -2/+4 |
| | | | | contact_block() | ||||
* | collection sync | friendica | 2014-07-16 | 1 | -0/+114 |
| | |||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-07-16 | 2 | -0/+128 |
|\ | |||||
| * | Introducing page template Redable (sic). A template for making it easier to ↵ | Jeroen | 2014-07-16 | 2 | -0/+128 |
| | | | | | | | | read long texts on a wide range of devices. Using rem and em for font sizes and region widths. Regions: aside, content, right_aside and footer. Advised to only use the middle content region as much as possible (but left and right can be used for indexes if you like). Based on the default template. Maybe later I will add some alternative css's. | ||||
* | | shield share meta info from markdown processing. | friendica | 2014-07-16 | 1 | -0/+17 |
| | | |||||
* | | allow a site to run cron daily at a chosen hour | friendica | 2014-07-16 | 1 | -3/+17 |
|/ | |||||
* | provide os_mkdir to workaround permission issues with php mkdir | friendica | 2014-07-16 | 9 | -9/+60 |
| | |||||
* | fix rename_system_url() for the case of somebody who has no local xchan_url ↵ | friendica | 2014-07-15 | 2 | -12/+22 |
| | | | | (was cloned from elsewhere and is not primary) | ||||
* | limit fields to what we require | friendica | 2014-07-14 | 1 | -1/+1 |
| | |||||
* | index collection sync info by hash rather than id | friendica | 2014-07-14 | 1 | -1/+1 |
| | |||||
* | clean up more code duplication | friendica | 2014-07-14 | 5 | -13/+29 |
| | |||||
* | Brain fart. Should really wait until the first cuppa kicks in. | friendica | 2014-07-14 | 1 | -1/+1 |
| | |||||
* | issue #536 - move a line so it doesn't interfere | friendica | 2014-07-14 | 1 | -1/+1 |
| | |||||
* | issue #536 | friendica | 2014-07-14 | 1 | -0/+13 |
| |