Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed deploy | Haakon Meland Eriksen | 2016-01-04 | 1 | -4/+0 |
| | |||||
* | Removed deploy to get from upstream | Haakon Meland Eriksen | 2016-01-03 | 6 | -16/+56 |
|\ | |||||
| * | Merge pull request #246 from ↵ | redmatrix | 2016-01-04 | 1 | -0/+5 |
| |\ | | | | | | | | | | | | | HaakonME/HaakonME-Hubzilla-on-OpenShift-Hubzilla-Chess Hubzilla on OpenShift deploy script with Huzilla Chess | ||||
| | * | Hubzilla Chess - single file commit to upstream | Haakon Meland Eriksen | 2016-01-03 | 1 | -1/+1 |
| | | | | | | | | | Adding Hubzilla Chess to Hubzilla on OpenShift deploy script | ||||
| * | | Merge pull request #247 from chris1315/patch-3 | redmatrix | 2016-01-04 | 1 | -0/+25 |
| |\ \ | | | | | | | | | Create about.bb | ||||
| | * | | Create about.bb | chris1315 | 2016-01-03 | 1 | -0/+25 |
| | | | | |||||
| * | | | forgot to add this to the docu | jeroenpraat | 2016-01-03 | 1 | -2/+2 |
| | | | | |||||
| * | | | added some real examples for the default-permission-role in de docu. also ↵ | jeroenpraat | 2016-01-03 | 3 | -14/+25 |
| |/ / | | | | | | | | | | updated comanche template redable and another css class to tpl file | ||||
* | / | Add Hubzilla Chess repo to deploy script | Haakon Meland Eriksen | 2016-01-03 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Add Hubzilla Chess repo to deploy script | Haakon Meland Eriksen | 2016-01-03 | 1 | -0/+5 |
|/ | |||||
* | Provide the ability for a hub admin to specify a default permissions role ↵ | redmatrix | 2016-01-02 | 3 | -4/+23 |
| | | | | for the first channel created by a new account. This simplifies channel creation by restricting the available options at registration time. The restriction is not applied to any additional channels created under the same account; and in any event can be changed immediately after channel creation, if desired. | ||||
* | Update es+nl strings and added title on hover for items (needed to view ↵ | jeroenpraat | 2016-01-02 | 7 | -212/+224 |
| | | | | titles that are cut-off) | ||||
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-01-01 | 2 | -1/+74 |
|\ | |||||
| * | Merge pull request #245 from chris1315/patch-2 | redmatrix | 2016-01-02 | 1 | -0/+73 |
| |\ | | | | | | | Create git_for_non_developers.bb | ||||
| | * | Create git_for_non_developers.bb | chris1315 | 2016-01-01 | 1 | -0/+73 |
| | | | |||||
| * | | Merge pull request #244 from anaqreon/anaqreon-titel-typo | redmatrix | 2016-01-02 | 1 | -1/+1 |
| |\ \ | | |/ | |/| | Misspelled Titel | ||||
| | * | Misspelled Titel | Andrew Manning | 2016-01-01 | 1 | -1/+1 |
| |/ | | | | | should be Title | ||||
* / | issue #241 (redmatrix issue 405) | redmatrix | 2016-01-01 | 6 | -100/+112 |
|/ | |||||
* | more issue #239 | redmatrix | 2015-12-31 | 1 | -1/+1 |
| | |||||
* | issue #239, provide 'Public' text on ACL selector when appropriate to do so. | redmatrix | 2015-12-31 | 3 | -14/+16 |
| | |||||
* | yearly license update | redmatrix | 2015-12-31 | 2 | -1/+2 |
| | |||||
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-12-31 | 4 | -58/+47 |
|\ | |||||
| * | nl+es-es string update | jeroenpraat | 2015-12-29 | 4 | -58/+47 |
| | | |||||
* | | comment clarification | redmatrix | 2015-12-31 | 1 | -1/+1 |
| | | |||||
* | | log API improvements and queue optimisation for singleton networks | redmatrix | 2015-12-31 | 7 | -49/+87 |
|/ | |||||
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-12-29 | 1 | -1/+1 |
|\ | |||||
| * | Merge pull request #238 from anaqreon/remove-bad-url | redmatrix | 2015-12-28 | 1 | -1/+1 |
| |\ | | | | | | | Removed defunct URL from old auto-update idea | ||||
| | * | Removed defunct URL from old auto-update idea | Andrew Manning | 2015-12-26 | 1 | -1/+1 |
| | | | |||||
* | | | store perms_accept on channel creation | redmatrix | 2015-12-29 | 2 | -3/+3 |
|/ / | |||||
* / | refresh issue | redmatrix | 2015-12-27 | 3 | -3/+10 |
|/ | |||||
* | Set accept permissions to that of role so if you change to a custom role you ↵ | redmatrix | 2015-12-25 | 1 | -1/+1 |
| | | | | don't start with nothing. | ||||
* | don't send wall-post notifications when creating webpages on another channel | redmatrix | 2015-12-25 | 1 | -1/+1 |
| | |||||
* | spelling | redmatrix | 2015-12-25 | 1 | -1/+1 |
| | |||||
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-12-25 | 3 | -47/+45 |
|\ | |||||
| * | update es-es strings | jeroenpraat | 2015-12-25 | 3 | -47/+45 |
| | | |||||
* | | regression: default inherited permission was not being set for a connection ↵ | redmatrix | 2015-12-25 | 3 | -7/+4 |
|/ | | | | if the permission was 'inherited'. We need to set these so that if somebody changes the top level permissions they don't have to go back and manually edit every connection to allow/deny what used to be an automatic inherited setting. | ||||
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-12-24 | 13 | -1710/+1761 |
|\ | |||||
| * | After reading and talking with experts I came to the conclusion that es-es ↵ | jeroenpraat | 2015-12-24 | 12 | -23098/+1 |
| | | | | | | | | and es-419 (and such) dont differ that much. Latin-American Spanish (es-419) is a good idea, but we are not in a rush. So linked es to es-es. That's the proper way to do. See also https://github.com/redmatrix/hubzilla/issues/234#issuecomment-167117960 | ||||
| * | reverted my previous commit. this is going to be fixed remotely upstream. ↵ | jeroenpraat | 2015-12-23 | 21 | -20/+1 |
| | | | | | | | | Meanwhile es points to .es-419. See https://github.com/redmatrix/hubzilla/issues/234#issuecomment-166961958. | ||||
| * | Spanish language codes. See issue #234 | jeroenpraat | 2015-12-23 | 41 | -0/+23117 |
| | | |||||
| * | update es+nl strings | jeroenpraat | 2015-12-22 | 4 | -1710/+1760 |
| | | |||||
* | | issue #235 | redmatrix | 2015-12-24 | 2 | -2/+2 |
| | | |||||
* | | start on refactor of plugin/theme/widget info block parsing | redmatrix | 2015-12-22 | 3 | -15/+16 |
|/ | |||||
* | make the queue api accessible to addons | redmatrix | 2015-12-21 | 2 | -2/+8 |
| | |||||
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-12-20 | 1 | -0/+1 |
|\ | |||||
| * | Merge pull request #232 from wave72/master | redmatrix | 2015-12-21 | 1 | -0/+1 |
| |\ | | | | | | | Added 'invitation_only' to site info | ||||
| | * | Added 'invitation_only' to site info | wave72 | 2015-12-20 | 1 | -0/+1 |
| | | | |||||
| | * | Merge pull request #4 from redmatrix/master | Wave | 2015-12-20 | 716 | -138586/+51589 |
| | |\ | | |/ | |/| | Merge master into dev branch | ||||
* | | | merge hell | redmatrix | 2015-12-20 | 4 | -42/+50 |
| | | | |||||
* | | | Merge branch 'HaakonME-master' | redmatrix | 2015-12-20 | 6 | -2480/+2575 |
|\ \ \ |