Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-21 | 1 | -2/+2 |
|\ | |||||
| * | Compatible update for .htaccess. | Klaus Weidenbach | 2015-06-22 | 1 | -2/+8 |
| | | | | | | | | This should hopefully work in Apache 2.2 and 2.4. | ||||
* | | some diaspora import issues uncovered during dry-run tests | redmatrix | 2015-06-21 | 1 | -0/+3 |
| | | |||||
* | | Compatible update for .htaccess. | Klaus Weidenbach | 2015-06-21 | 1 | -2/+8 |
|/ | | | | This should hopefully work in Apache 2.2 and 2.4. | ||||
* | do not show default in scheme selection dropdown. default.php and ↵ | Mario Vavti | 2015-06-21 | 3 | -3/+6 |
| | | | | default.css should be symlinks. adjust doco accordingly. | ||||
* | more generic-content-wrapper and some css fixes | Mario Vavti | 2015-06-19 | 3 | -35/+44 |
| | |||||
* | cloud.tpl | Mario Vavti | 2015-06-19 | 1 | -0/+4 |
| | |||||
* | bring some more generic-content-wrappers and fix some of them | Mario Vavti | 2015-06-19 | 11 | -268/+280 |
| | |||||
* | Merge branch 'master' of https://github.com/redmatrix/redmatrix | Mario Vavti | 2015-06-15 | 2 | -6998/+7222 |
|\ | |||||
| * | Update Dutch language strings | jeroenpraat | 2015-06-15 | 2 | -6998/+7222 |
| | | |||||
* | | update spin.js | Mario Vavti | 2015-06-15 | 2 | -157/+184 |
|/ | |||||
* | do not allow/show acl button on photo edit if not owner | Mario Vavti | 2015-06-15 | 2 | -1/+3 |
| | |||||
* | Merge pull request #347 from tuscanhobbit/dev | Paolo T | 2015-06-11 | 2 | -7219/+7160 |
|\ | | | | | updated italian strings | ||||
| * | updated italian strings | Paolo Tacconi | 2015-06-11 | 2 | -7219/+7160 |
| | | |||||
* | | set width for region_3 only if center page content is set | Mario Vavti | 2015-06-11 | 3 | -4/+15 |
| | | |||||
* | | fix rendering of affinity slider | Mario Vavti | 2015-06-11 | 2 | -2/+4 |
| | | |||||
* | | assign right aside the same width as we have in left aside but hide it on ↵ | Mario Vavti | 2015-06-10 | 4 | -11/+18 |
| | | | | | | | | small and xs screens. make aside width a variablee for easier handling. | ||||
* | | put mirror_frontpage setting into admin/site | redmatrix | 2015-06-09 | 1 | -0/+1 |
| | | |||||
* | | toggle diaspora protocol on a per-channel level in addition to the existing ↵ | redmatrix | 2015-06-09 | 1 | -0/+1 |
| | | | | | | | | per site setting. Default is enabled if the site setting is enabled. | ||||
* | | css regression fixes | Mario Vavti | 2015-06-08 | 1 | -0/+12 |
| | | |||||
* | | Merge branch 'frontpage' | redmatrix | 2015-06-07 | 2 | -2/+3 |
|\ \ | |||||
| * | | more frontpage tweaks | redmatrix | 2015-06-07 | 1 | -1/+1 |
| | | | |||||
| * | | reverse logic of homepage login setting | redmatrix | 2015-06-07 | 1 | -1/+1 |
| | | | |||||
| * | | frontpage tweaks | redmatrix | 2015-06-07 | 1 | -0/+1 |
| | | | |||||
| * | | frontpage changes | redmatrix | 2015-06-07 | 1 | -1/+1 |
| | | | |||||
* | | | Upd NL | jeroenpraat | 2015-06-07 | 2 | -7229/+7132 |
|/ / | |||||
* | | missing comma | Mario Vavti | 2015-06-06 | 1 | -1/+1 |
| | | |||||
* | | Added translatable strings to the Display Settings page and refreshed ↵ | jeroenpraat | 2015-06-06 | 1 | -3/+3 |
| | | | | | | | | util/messages.po. | ||||
* | | css fixes | Mario Vavti | 2015-06-06 | 1 | -17/+9 |
| | | |||||
* | | whitespace | Mario Vavti | 2015-06-06 | 1 | -169/+175 |
| | | |||||
* | | some cleanup after scheme transition | Mario Vavti | 2015-06-06 | 2 | -196/+19 |
| | | |||||
* | | More schemas in new format | jeroenpraat | 2015-06-05 | 4 | -119/+114 |
| | | |||||
* | | Schemas: should be ok now. | jeroenpraat | 2015-06-03 | 7 | -342/+116 |
| | | |||||
* | | 2 more schemas in new format | jeroenpraat | 2015-06-03 | 4 | -239/+473 |
| | | |||||
* | | empty php schema back | jeroenpraat | 2015-06-03 | 1 | -0/+2 |
| | | |||||
* | | First schema completely to the new format. git-marijus: Can you please ↵ | jeroenpraat | 2015-06-02 | 2 | -123/+237 |
| | | | | | | | | quickly check if I'm doing it right? | ||||
* | | add some yes/no labels and minor template fixes | Mario Vavti | 2015-05-29 | 2 | -3/+3 |
| | | |||||
* | | some fixes to make menu sharing work and expose it in the ui. | Mario Vavti | 2015-05-29 | 2 | -12/+14 |
| | | |||||
* | | show created/edited dates for menus | Mario Vavti | 2015-05-29 | 2 | -3/+20 |
| | | |||||
* | | update pt_BR translation | Alexandre Hannud Abdo | 2015-05-28 | 2 | -1021/+1031 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-25 | 1 | -0/+1 |
|\ \ | |||||
| * | | add this to better support mobile devices out of the box in zen template | Mario Vavti | 2015-05-25 | 1 | -0/+1 |
| | | | |||||
* | | | add toggle for ALLOWCODE to admin/channel and also fix the ability to toggle ↵ | redmatrix | 2015-05-25 | 1 | -1/+2 |
|/ / | | | | | | | the censor flag from that page. | ||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-20 | 2 | -71/+71 |
|\ \ | |||||
| * | | Another update for Dutch with complete $Projectname substitutions (and ↵ | jeroenpraat | 2015-05-20 | 2 | -71/+71 |
| | | | | | | | | | | | | channel activity as suggested on previous discussion) | ||||
* | | | PRIVACY: possible privacy leakage under a defined set of circumstances | redmatrix | 2015-05-20 | 1 | -0/+3 |
|/ / | |||||
* | | New update Dutch | jeroenpraat | 2015-05-19 | 2 | -104/+104 |
| | | |||||
* | | Update Dutch (Projectname variable not translated yet, because of undefined ↵ | jeroenpraat | 2015-05-18 | 2 | -383/+390 |
| | | | | | | | | variable) | ||||
* | | updated the templates to the {{}}, compared to | Razlo | 2015-05-17 | 4 | -23/+23 |
| | | |||||
* | | Add sprintf.js v1.0.2. | Klaus Weidenbach | 2015-05-14 | 1 | -4/+3 |
| | | | | | | | | | | | | | | | | This script provides sprintf() for JavaScript. It can be used for example for translating strings used in JavaScript with variables. It is licensed under BSD-3-Clause and can be found on GitHub: https://github.com/alexei/sprintf.js |