aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixed deployHaakon Meland Eriksen2016-01-041-4/+0
|
* Removed deploy to get from upstreamHaakon Meland Eriksen2016-01-036-16/+56
|\
| * Merge pull request #246 from ↵redmatrix2016-01-041-0/+5
| |\ | | | | | | | | | | | | HaakonME/HaakonME-Hubzilla-on-OpenShift-Hubzilla-Chess Hubzilla on OpenShift deploy script with Huzilla Chess
| | * Hubzilla Chess - single file commit to upstreamHaakon Meland Eriksen2016-01-031-1/+1
| | | | | | | | | Adding Hubzilla Chess to Hubzilla on OpenShift deploy script
| * | Merge pull request #247 from chris1315/patch-3redmatrix2016-01-041-0/+25
| |\ \ | | | | | | | | Create about.bb
| | * | Create about.bbchris13152016-01-031-0/+25
| | | |
| * | | forgot to add this to the docujeroenpraat2016-01-031-2/+2
| | | |
| * | | added some real examples for the default-permission-role in de docu. also ↵jeroenpraat2016-01-033-14/+25
| |/ / | | | | | | | | | updated comanche template redable and another css class to tpl file
* | / Add Hubzilla Chess repo to deploy scriptHaakon Meland Eriksen2016-01-031-1/+1
| |/ |/|
* | Add Hubzilla Chess repo to deploy scriptHaakon Meland Eriksen2016-01-031-0/+5
|/
* Provide the ability for a hub admin to specify a default permissions role ↵redmatrix2016-01-023-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 ↵jeroenpraat2016-01-027-212/+224
| | | | titles that are cut-off)
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-012-1/+74
|\
| * Merge pull request #245 from chris1315/patch-2redmatrix2016-01-021-0/+73
| |\ | | | | | | Create git_for_non_developers.bb
| | * Create git_for_non_developers.bbchris13152016-01-011-0/+73
| | |
| * | Merge pull request #244 from anaqreon/anaqreon-titel-typoredmatrix2016-01-021-1/+1
| |\ \ | | |/ | |/| Misspelled Titel
| | * Misspelled TitelAndrew Manning2016-01-011-1/+1
| |/ | | | | should be Title
* / issue #241 (redmatrix issue 405)redmatrix2016-01-016-100/+112
|/
* more issue #239redmatrix2015-12-311-1/+1
|
* issue #239, provide 'Public' text on ACL selector when appropriate to do so.redmatrix2015-12-313-14/+16
|
* yearly license updateredmatrix2015-12-312-1/+2
|
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-314-58/+47
|\
| * nl+es-es string updatejeroenpraat2015-12-294-58/+47
| |
* | comment clarificationredmatrix2015-12-311-1/+1
| |
* | log API improvements and queue optimisation for singleton networksredmatrix2015-12-317-49/+87
|/
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-291-1/+1
|\
| * Merge pull request #238 from anaqreon/remove-bad-urlredmatrix2015-12-281-1/+1
| |\ | | | | | | Removed defunct URL from old auto-update idea
| | * Removed defunct URL from old auto-update ideaAndrew Manning2015-12-261-1/+1
| | |
* | | store perms_accept on channel creationredmatrix2015-12-292-3/+3
|/ /
* / refresh issueredmatrix2015-12-273-3/+10
|/
* Set accept permissions to that of role so if you change to a custom role you ↵redmatrix2015-12-251-1/+1
| | | | don't start with nothing.
* don't send wall-post notifications when creating webpages on another channelredmatrix2015-12-251-1/+1
|
* spellingredmatrix2015-12-251-1/+1
|
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-253-47/+45
|\
| * update es-es stringsjeroenpraat2015-12-253-47/+45
| |
* | regression: default inherited permission was not being set for a connection ↵redmatrix2015-12-253-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_mergeredmatrix2015-12-2413-1710/+1761
|\
| * After reading and talking with experts I came to the conclusion that es-es ↵jeroenpraat2015-12-2412-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. ↵jeroenpraat2015-12-2321-20/+1
| | | | | | | | Meanwhile es points to .es-419. See https://github.com/redmatrix/hubzilla/issues/234#issuecomment-166961958.
| * Spanish language codes. See issue #234jeroenpraat2015-12-2341-0/+23117
| |
| * update es+nl stringsjeroenpraat2015-12-224-1710/+1760
| |
* | issue #235redmatrix2015-12-242-2/+2
| |
* | start on refactor of plugin/theme/widget info block parsingredmatrix2015-12-223-15/+16
|/
* make the queue api accessible to addonsredmatrix2015-12-212-2/+8
|
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-201-0/+1
|\
| * Merge pull request #232 from wave72/masterredmatrix2015-12-211-0/+1
| |\ | | | | | | Added 'invitation_only' to site info
| | * Added 'invitation_only' to site infowave722015-12-201-0/+1
| | |
| | * Merge pull request #4 from redmatrix/masterWave2015-12-20716-138586/+51589
| | |\ | | |/ | |/| Merge master into dev branch
* | | merge hellredmatrix2015-12-204-42/+50
| | |
* | | Merge branch 'HaakonME-master'redmatrix2015-12-206-2480/+2575
|\ \ \