harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,488 Commits 6 Branches 36 Tags
ca8d252ad75306e6d3cd066d5c593e94de1dfbdd
Commit Graph

24488 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wave72 0eb5dd6d21 In Hubzilla messages.po is hmessages.po 2016-01-07 11:08:19 +01:00
mrjive 0fa34c6880 Merge pull request #12 from redmatrix/master 
updating from original codebase
 2016-01-07 10:47:11 +01:00
Haakon Meland Eriksen bfe8e1e2e9 Merge remote-tracking branch 'upstream/master' 2016-01-07 00:02:40 +01:00
redmatrix 761afd029d version roll 1.1 2016-01-06 13:53:49 -08:00
redmatrix 93565ea768 features management page for hubmins 2016-01-06 13:01:28 -08:00
Haakon Meland Eriksen 1f82beb2ef Merge remote-tracking branch 'upstream/master' 2016-01-06 06:36:40 +01:00
redmatrix c076e72cbf provide an option to toggle the view of locked features so we can use the same list in an admin feature set & lock page. 2016-01-05 20:38:32 -08:00
redmatrix 26139ee06f make 'refresh permissions' do something useful for non-zot connections 2016-01-04 23:27:06 -08:00
redmatrix bd394ba6dc Merge https://github.com/redmatrix/hubzilla into pending_merge 2016-01-04 22:13:46 -08:00
redmatrix 1f0e603992 expire delivery reports at 10 days by default instead of 30. 2016-01-04 22:12:36 -08:00
Haakon Meland Eriksen f5c10f249c Merge remote-tracking branch 'upstream/master' 2016-01-05 06:24:43 +01:00
ken restivo 69f9842ec9 Merge pull request #249 from chris1315/patch-5 
main.bb
 2016-01-04 20:03:10 -08:00
Haakon Meland Eriksen d2d71b8630 Merge remote-tracking branch 'upstream/master' 2016-01-04 20:05:59 +01:00
chris1315 ff3aa6c663 main.bb 
main documentation in french
 2016-01-04 19:53:55 +01:00
mrjive dcb5f62413 Merge pull request #11 from redmatrix/master 
updating from original codebase
 2016-01-04 18:20:49 +01:00
Wave c3e2505b66 Merge pull request #248 from wave72/master 
Updated Italian strings
 2016-01-04 14:26:09 +01:00
Paolo Tacconi c7cc595906 Updated Italian strings 2016-01-04 14:18:52 +01:00
redmatrix 2dd9e27a44 Merge https://github.com/redmatrix/hubzilla into pending_merge 2016-01-04 01:20:01 -08:00
redmatrix 26ed0b0f34 version script was all screwed up 2016-01-04 01:19:40 -08:00
redmatrix 374aadc97e Provide a mechanism for a hub admin to lock features in the on or off state. Locked features will not be available in the UI on the Additional Features page to be set by members. If all features are locked, the link to the Additional Features page will not be displayed. 2016-01-04 01:02:10 -08:00
Haakon Meland Eriksen 86dd4e7ee0 Fixed deploy 2016-01-04 06:41:25 +01:00
Haakon Meland Eriksen 714a93022f Removed deploy to get from upstream 2016-01-03 23:26:00 +01:00
redmatrix 35fd21531a Merge pull request #246 from HaakonME/HaakonME-Hubzilla-on-OpenShift-Hubzilla-Chess 
Hubzilla on OpenShift deploy script with Huzilla Chess
 2016-01-04 08:12:16 +11:00
redmatrix ca00ae2e23 Merge pull request #247 from chris1315/patch-3 
Create about.bb
 2016-01-04 08:12:02 +11:00
jeroenpraat b8655dd3bc forgot to add this to the docu 2016-01-03 22:01:27 +01:00
jeroenpraat 9e6f43e3ff added some real examples for the default-permission-role in de docu. also updated comanche template redable and another css class to tpl file 2016-01-03 21:56:39 +01:00
chris1315 9ec258b74d Create about.bb 2016-01-03 19:45:53 +01:00
Haakon Meland Eriksen 8ca4fb3784 Add Hubzilla Chess repo to deploy script 2016-01-03 14:13:29 +01:00
Haakon Meland Eriksen d860dd753e Hubzilla Chess - single file commit to upstream 
Adding Hubzilla Chess to Hubzilla on OpenShift deploy script
 2016-01-03 12:50:15 +01:00
Haakon Meland Eriksen b4ccc62596 Add Hubzilla Chess repo to deploy script 2016-01-03 12:23:42 +01:00
mrjive 07f5bdde60 Merge pull request #10 from redmatrix/master 
updating from original codebase
 2016-01-03 09:52:37 +01:00
redmatrix 5b0a17359d Provide the ability for a hub admin to specify a default permissions role 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. 2016-01-02 23:39:57 -08:00
jeroenpraat 1ad90b8662 Update es+nl strings and added title on hover for items (needed to view titles that are cut-off) 2016-01-02 15:14:30 +01:00
redmatrix 54ceef0ba1 Merge https://github.com/redmatrix/hubzilla into pending_merge 2016-01-01 16:13:29 -08:00
redmatrix c38edfcb32 issue #241 (redmatrix issue 405) 2016-01-01 16:12:43 -08:00
redmatrix 5b9afd7555 Merge pull request #245 from chris1315/patch-2 
Create git_for_non_developers.bb
 2016-01-02 07:49:00 +11:00
redmatrix e665afcc2a Merge pull request #244 from anaqreon/anaqreon-titel-typo 
Misspelled Titel
 2016-01-02 07:48:42 +11:00
chris1315 b0ec0e9eac Create git_for_non_developers.bb 2016-01-01 16:24:49 +01:00
Andrew Manning 49e4016ba2 Misspelled Titel 
should be Title
 2016-01-01 05:53:29 -05:00
redmatrix 9ee7d60afe more issue #239 2015-12-31 15:17:12 -08:00
redmatrix 1964fa05e1 issue #239, provide 'Public' text on ACL selector when appropriate to do so. 2015-12-31 15:10:36 -08:00
redmatrix caf3a69d99 yearly license update 2015-12-31 13:25:23 -08:00
redmatrix 769ad4a836 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-12-31 12:31:17 -08:00
redmatrix 062c03c9f7 comment clarification 2015-12-31 12:30:49 -08:00
redmatrix 2cf4ac26fd log API improvements and queue optimisation for singleton networks 2015-12-31 12:26:41 -08:00
jeroenpraat 405725875d nl+es-es string update 2015-12-29 22:09:47 +01:00
redmatrix 5f61f57b2c Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-12-29 11:16:47 -08:00
redmatrix fbeb33479b store perms_accept on channel creation 2015-12-29 11:16:13 -08:00
redmatrix ffd4557447 Merge pull request #238 from anaqreon/remove-bad-url 
Removed defunct URL from old auto-update idea
 2015-12-28 18:12:50 +11:00
redmatrix cf5df259e5 refresh issue 2015-12-27 21:08:28 -08:00