Commit Graph

15247 Commits

Author SHA1 Message Date
redmatrix 25caeee854 issue #204 2015-12-01 20:21:44 -08:00
redmatrix 20ce7a2d9f Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-12-01 15:51:39 -08:00
redmatrix 1ba74d824b usercache is no longer used 2015-12-01 15:51:15 -08:00
redmatrix be7b706486 Merge pull request #200 from anaqreon/update-addon-script
Update addon script
2015-12-02 09:08:25 +11:00
Mario Vavti 78e18fcdcf fix badge padding in narrow navbar 2015-12-01 13:28:50 +01:00
Mario Vavti 706598313e make narrow navbar setting work again 2015-12-01 13:18:08 +01:00
redmatrix 4b191fb558 version 2015-11-30 14:54:34 -08:00
Wave de1abf9981 Merge pull request #201 from wave72/master
Updated Italian strings
2015-11-30 16:29:16 +01:00
Paolo Tacconi c69f6ca1f4 Updated Italian strings 2015-11-30 16:25:24 +01:00
Andrew Manning d4b04d22ed Merge branch 'master' of https://github.com/redmatrix/hubzilla into update-addon-script 2015-11-30 07:50:21 -05:00
Andrew Manning b1f4b9759b Abort addon update if repo does not exist 2015-11-30 07:49:56 -05:00
redmatrix 650f882265 generalise the site black|white allow lists, also add a channel black|white list for future use 2015-11-29 20:26:00 -08:00
redmatrix a2747403f2 report correct directory mode for standalone directories in siteinfo 2015-11-29 19:45:29 -08:00
redmatrix 3f9412add2 create get_site_info() function so we can have a siteinfo.json module instead of or actually in addition to siteinfo/json 2015-11-29 19:37:03 -08:00
redmatrix 29877963be issue #189 2015-11-29 18:07:59 -08:00
redmatrix 302c5afdee don't try to pull public content from dead sites 2015-11-29 16:28:35 -08:00
redmatrix 9f90806027 log whatever is showing up in the delivery hash array since it seems that one site has something unusual there and it is throwing errors. 2015-11-29 15:23:29 -08:00
redmatrix d3aa50c9c3 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-11-28 19:17:28 -08:00
redmatrix 1708769d42 version 2015-11-28 19:16:55 -08:00
Mario Vavti 4e223f816a reflect in form if we are editing or creating 2015-11-28 17:05:37 +01:00
Mario Vavti 7db86a4e05 css fixes 2015-11-28 14:47:17 +01:00
Mario Vavti 122d7281f7 fix tpl if clause 2015-11-28 11:04:33 +01:00
redmatrix 4bfd34b479 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-11-27 20:05:47 -08:00
redmatrix 962d9f36d0 document dreport expiration setting 2015-11-27 20:05:20 -08:00
ken restivo 216d41cd64 Reverted. 2015-11-27 16:32:32 -08:00
ken restivo 4af104384b Re-reading zottel's excellent docs, 70 seems the recommended default. Changed. 2015-11-27 14:43:17 -08:00
ken restivo aa78d51521 More sane defaults, to avoid problems. Addresses #188 2015-11-27 14:40:22 -08:00
ken restivo 16e7ec7bfe Safe defaults to prevent #188 2015-11-27 14:38:29 -08:00
Mario Vavti fce1dc083b add templates 2015-11-27 22:53:36 +01:00
Mario Vavti bcfa72ed31 move events tools to aside widget 2015-11-27 22:45:28 +01:00
Mario Vavti b92cc852d1 css fixes 2015-11-27 21:44:02 +01:00
Mario Vavti 6762af4158 Merge branch 'master' of https://github.com/redmatrix/hubzilla 2015-11-27 20:55:44 +01:00
Mario Vavti f691e8981a fixes #194 - New directory server is selected on every directory page reload 2015-11-27 20:55:27 +01:00
git-marijus 6875a540ec Merge pull request #193 from zzottel/master
added info about Apache settings to avoid Apache running wild
2015-11-27 14:04:59 +01:00
Mario Vavti e569f5d6eb unset does not work in webkit browsers 2015-11-27 14:00:37 +01:00
Mario Vavti 61a5e81bc6 only show edit icon for your own events and minoe cleanup 2015-11-27 13:55:02 +01:00
Mario Vavti ee153f64d4 add spinner to events 2015-11-27 13:32:20 +01:00
zottel 4c4db6f73c added info about Apache settings to avoid Apache running wild 2015-11-27 10:35:31 +01:00
redmatrix fa5a382c4b don't show item_delayed_publish items in tag clouds 2015-11-26 17:35:41 -08:00
Mario Vavti a73c385831 lost calendar icon 2015-11-26 23:29:49 +01:00
Mario Vavti 91b35c5349 various css fixes 2015-11-26 23:19:06 +01:00
Mario Vavti 056db37c66 beautify event item code 2015-11-26 22:14:20 +01:00
Mario Vavti 5cb71fa5da default timepicker to 15 min steps. abbr -> span 2015-11-26 21:00:04 +01:00
Mario Vavti 55d00243fb Merge branch 'master' of https://github.com/redmatrix/hubzilla 2015-11-26 20:53:59 +01:00
Mario Vavti 8a269823d2 improve event rendering 2015-11-26 20:53:42 +01:00
redmatrix 5ec5b127d0 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-11-26 11:38:07 -08:00
redmatrix 0cf9e498b9 version 2015-11-26 11:37:43 -08:00
Mario Vavti c407e72dcc add location 2015-11-26 16:40:40 +01:00
Mario Vavti 8e3b796a2f fix event rendering 2015-11-26 16:38:14 +01:00
Mario Vavti 17e7b276f6 we also need nofinish in the object. css fices 2015-11-26 14:45:22 +01:00