| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-09 | 2 | -0/+2 |
| |\ | |||||
| | * | 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. | ||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-09 | 3 | -2/+15 |
| |\| | | | | | | | | | | | | | | | | | Conflicts: install/schema_mysql.sql mod/home.php mod/page.php view/nl/messages.po view/nl/strings.php | ||||
| | * | 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 |
| | |/ | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-06 | 11 | -793/+619 |
| |\| | | | | | | | | | Conflicts: util/messages.po | ||||
| | * | 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 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-02 | 2 | -123/+237 |
| |\| | |||||
| | * | 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? | ||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-31 | 4 | -10/+29 |
| |\| | |||||
| | * | 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 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-28 | 2 | -2496/+3962 |
| |\| | | | | | | | | | | | | | | | Conflicts: install/schema_mysql.sql mod/impel.php view/pt-br/messages.po view/pt-br/strings.php | ||||
| | * | update pt_BR translation | Alexandre Hannud Abdo | 2015-05-28 | 2 | -1021/+1031 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-25 | 2 | -1/+3 |
| |\| | |||||
| | * | 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 branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-20 | 3 | -72/+76 |
| |\| | | | | | | | | | | | | | | | Conflicts: include/items.php include/text.php mod/item.php view/nl/messages.po | ||||
| | * | 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 |
| | |/ | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-19 | 1 | -52/+56 |
| |\| | | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php | ||||
| | * | New update Dutch | jeroenpraat | 2015-05-19 | 2 | -104/+104 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-18 | 3 | -128/+128 |
| |\| | | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php | ||||
| | * | Update Dutch (Projectname variable not translated yet, because of undefined ↵ | jeroenpraat | 2015-05-18 | 2 | -383/+390 |
| | | | | | | | | | variable) | ||||
| * | | Merge branch 'master' into tres | redmatrix | 2015-05-17 | 4 | -23/+23 |
| |\ \ | |||||
| | * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-17 | 4 | -23/+23 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/bb2diaspora.php include/diaspora.php include/enotify.php mod/admin.php mod/cloud.php mod/dav.php mod/home.php mod/invite.php mod/like.php mod/mitem.php mod/p.php mod/pubsites.php mod/setup.php mod/siteinfo.php util/messages.po | ||||
| | | * | updated the templates to the {{}}, compared to | Razlo | 2015-05-17 | 4 | -23/+23 |
| | | | | |||||
| * | | | Merge branch 'master' into tres | redmatrix | 2015-05-14 | 1 | -4/+3 |
| |\| | | |||||
| | * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-14 | 1 | -4/+3 |
| | |\| | |||||
| | | * | 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 | ||||
| | | * | Dutch 100\% again | jeroenpraat | 2015-05-12 | 2 | -56/+76 |
| | | | | |||||
| | | * | update pt-br transation | Alexandre Hannud Abdo | 2015-05-11 | 2 | -6099/+7075 |
| | | | | |||||
| * | | | Merge branch 'master' into tres | redmatrix | 2015-05-14 | 56 | -8598/+8554 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/Import/refimport.php include/activities.php include/attach.php include/event.php include/externals.php include/identity.php include/items.php include/notifier.php include/photos.php include/taxonomy.php include/zot.php mod/channel.php mod/connedit.php mod/events.php mod/item.php mod/like.php mod/manage.php mod/mood.php mod/ping.php mod/poke.php mod/subthread.php mod/tagger.php mod/thing.php | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |