Commit Graph
17358 Commits
Author SHA1 Message Date
Paolo Tacconi 04180985cb Italian strings updated 2016-01-11 10:55:51 +01:00
Haakon Meland Eriksen 42433c0b44 Merge remote-tracking branch 'upstream/master' 2016-01-11 06:38:24 +01:00
redmatrix f4d47f825d revert lost link 2016-01-10 20:38:47 -08:00
redmatrix 44137be88d Merge pull request #252 from einervonvielen/homeinstall
installation script for debian next to a router at home
2016-01-11 15:38:07 +11:00
redmatrix a524f0c2c1 Merge https://github.com/redmatrix/hubzilla into pending_merge 2016-01-10 17:40:20 -08:00
redmatrix d79d6c7055 the mail_isreply flag wasn't being set in the right cases 2016-01-10 17:39:18 -08:00
jeroenpraat e51035ba9a String update es-es and nl. Plus some extra bits, incl .gitignore update with pageheader.html 2016-01-10 20:45:39 +01:00
Einer von Vielen d4645ec609 Added files for installation script 2016-01-10 18:25:36 +01:00
Einer von Vielen 51f34b6b07 indexed 2016-01-10 18:24:15 +01:00
mrjive 9cbbc92062 Merge pull request #13 from redmatrix/master
updating from original codebase
2016-01-10 09:44:43 +01:00
redmatrix 23c7086605 add locked features to siteinfo to assist in debugging 2016-01-09 23:39:53 -08:00
redmatrix b00c22916a fix relative urls on some Diaspora profile photos 2016-01-09 14:02:58 -08:00
Haakon Meland Eriksen 41057ac364 Merge remote-tracking branch 'upstream/master' 2016-01-09 18:47:52 +01:00
redmatrix 1c982315dd issue #251 2016-01-07 20:04:13 -08:00
redmatrix bf99906386 provide admin toggle to disable delivery reports 2016-01-07 14:27:06 -08:00
redmatrix 3c88184177 optional support for public key pinning 2016-01-07 14:06:51 -08:00
redmatrix f4968e9f45 Merge https://github.com/redmatrix/hubzilla into pending_merge 2016-01-07 12:48:42 -08:00
redmatrix 100412267a extra security headers, revert or fix if functionality is blocked 2016-01-07 12:47:46 -08:00
redmatrix 00b98730f7 Merge pull request #250 from wave72/master
In Hubzilla messages.po is hmessages.po
2016-01-08 06:44:29 +11:00
Wave72 242da95eed Wrong branding in Translations doc 2016-01-07 11:24:31 +01:00
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