Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-07-25 | 19 | -5919/+6636 |
|\ | |||||
| * | make profile edit pencil stand out a bit on darker backgrounds | friendica | 2014-07-24 | 2 | -1/+2 |
| | | |||||
| * | always provide a profile edit entry in the nav usermenu | friendica | 2014-07-24 | 1 | -2/+2 |
| | | |||||
| * | cherry pick pull request #544 | friendica | 2014-07-24 | 2 | -7/+2 |
| | | |||||
| * | French Translations | mycocham | 2014-07-24 | 18 | -5918/+6639 |
| | | |||||
* | | fixes #545 | marijus | 2014-07-25 | 1 | -0/+4 |
|/ | |||||
* | update to bootstrap-3.2 and minor css adjustments | marijus | 2014-07-24 | 2 | -20/+2 |
| | |||||
* | 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 branch 'master' of https://github.com/friendica/red | Jeroen | 2014-07-23 | 4 | -19/+92 |
|\ \ | |||||
| * | | some backend JS support for an endless scroll directory | friendica | 2014-07-22 | 1 | -3/+68 |
| | | | |||||
| * | | 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. | ||||
* | | | update nl | Jeroen | 2014-07-23 | 2 | -1095/+1154 |
|/ / | |||||
* / | IT: updated strings | tuscanhobbit | 2014-07-19 | 12 | -5961/+6200 |
|/ | |||||
* | provide a specific permission for liking profiles (reuse the obsolete ↵ | friendica | 2014-07-17 | 2 | -4/+19 |
| | | | | bookmark permission), also remove the unused 'unconnected contacts' view for now. | ||||
* | make mod_like interactive if requested | friendica | 2014-07-17 | 1 | -4/+1 |
| | |||||
* | 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. | ||||
* | small fix nl | jeroenpraat | 2014-07-09 | 2 | -3/+3 |
| | |||||
* | more event display formatting | friendica | 2014-07-07 | 3 | -10/+23 |
| | |||||
* | event render improvements | friendica | 2014-07-06 | 3 | -4/+10 |
| | |||||
* | nl 100%git status | jeroenpraat | 2014-07-06 | 2 | -5969/+6173 |
| | |||||
* | some initial work towards email address verification | friendica | 2014-07-03 | 1 | -0/+25 |
| | |||||
* | fix nl | jeroenpraat | 2014-07-03 | 2 | -62/+62 |
| | |||||
* | move code out of templates - not sure how this even worked. | friendica | 2014-07-03 | 1 | -9/+9 |
| | |||||
* | Red Matrix default instead of global default. Is more clear. Update nl to ↵ | jeroenpraat | 2014-07-02 | 3 | -6056/+5857 |
| | | | | 99%. Update util/messages.po | ||||
* | Merge branch 'master' of https://github.com/friendica/red | jeroenpraat | 2014-07-02 | 3 | -6074/+5878 |
|\ | |||||
| * | Merge pull request #525 from tuscanhobbit/master | Paolo T | 2014-07-02 | 2 | -6074/+5875 |
| |\ | | | | | | | IT: strings updated | ||||
| | * | IT: strings updated | Paolo Tacconi | 2014-07-02 | 2 | -6074/+5875 |
| | | | |||||
| * | | minor adjustments | friendica | 2014-07-01 | 1 | -0/+3 |
| | | | |||||
* | | | Changed Default to Light (global default). So if hub owners want to change ↵ | jeroenpraat | 2014-07-02 | 1 | -1/+1 |
|/ / | | | | | | | the default, they don't get two defaults. Please revert when not needed/wanted. | ||||
* | | fix 1 error in nl that somehow sneaked in | jeroenpraat | 2014-07-01 | 2 | -3/+3 |
| | | |||||
* | | update/approve nl to 98%git status | jeroenpraat | 2014-07-01 | 2 | -99/+99 |
| | | |||||
* | | update nl | jeroenpraat | 2014-07-01 | 2 | -117/+117 |
| | | |||||
* | | Merge pull request #520 from pixelroot/master | RedMatrix | 2014-07-01 | 2 | -694/+769 |
|\ \ | | | | | | | Updated Russian translation | ||||
| * | | Updated Russian translation | pixelroot | 2014-06-30 | 2 | -694/+769 |
| | | | |||||
* | | | Merge pull request #521 from tuscanhobbit/master | RedMatrix | 2014-07-01 | 1 | -22/+30 |
|\ \ \ | | |/ | |/| | Changed the lock icon behaviour | ||||
| * | | Changed the lock icon behaviour | Paolo Tacconi | 2014-06-30 | 1 | -22/+30 |
| | | | |||||
* | | | update nl | jeroenpraat | 2014-06-30 | 2 | -35/+35 |
| | | | |||||
* | | | update nl | jeroenpraat | 2014-06-29 | 2 | -566/+641 |
| | | | |||||
* | | | Merge pull request #516 from dawnbreak/master | RedMatrix | 2014-06-30 | 1 | -14/+9 |
|\ \ \ | | | | | | | | | Fixed a wrong timestamp update when adding a file. | ||||
| * | | | Fixed some more timestamp bugs in RedDAV. | Klaus Weidenbach | 2014-06-29 | 1 | -14/+9 |
| | | | | | | | | | | | | | | | | Fixed an SQL-query in RedFile::put(), where parameters where in wrong order. | ||||
* | | | | Remove Remove Account link from account settings | Christian Vogeley | 2014-06-29 | 2 | -4/+4 |
|/ / / | | | | | | | | | | | | | because it doesn’t remove the account. Move channel removal link to channel page | ||||
* | | | Merge pull request #515 from tuscanhobbit/master | Paolo T | 2014-06-29 | 2 | -488/+563 |
|\| | | | | | | | | IT:updated strings | ||||
| * | | IT:updated strings | tuscanhobbit | 2014-06-29 | 2 | -488/+563 |
| | | | |||||
* | | | Merge pull request #513 from dawnbreak/master | RedMatrix | 2014-06-29 | 1 | -0/+23 |
|\ \ \ | | | | | | | | | Some documentation for include/reddav.php and a new tpl-file. | ||||
| * | | | Some documentation for include/reddav.php and a new tpl-file. | Klaus Weidenbach | 2014-06-29 | 1 | -0/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documented include/reddav.php a bit more to understand what it is about to try to clean up some parts. Still a lot to be done here. I put serveral @todo markers that need to be checked. Moved some more HTML to template file. Changed getETag() return format according to documentation. (ETag MUST be surrounded by double-quotes) | ||||
* | | | | Merge pull request #514 from tuscanhobbit/master | RedMatrix | 2014-06-29 | 4 | -37/+27 |
|\ \ \ \ | |/ / / |/| / / | |/ / | Checkboxes were not aligned in connedit, added a table and removed orphaned filestorage.tpl | ||||
| * | | Checkboxes were not aligned in connedit, added a table | tuscanhobbit | 2014-06-28 | 4 | -37/+27 |
| | | | |||||
* | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-06-26 | 2 | -1947/+1939 |
|\ \ \ | |||||
| * | | | update nl | jeroenpraat | 2014-06-27 | 2 | -1947/+1939 |
| | | | |