Commit graph

15491 commits

Author SHA1 Message Date
redmatrix
c38edfcb32 issue #241 (redmatrix issue 405) 2016-01-01 16:12:43 -08: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
Andrew Manning
3d6359f2e7 Removed defunct URL from old auto-update idea 2015-12-26 16:20:56 -05:00
redmatrix
5a229234e7 Set accept permissions to that of role so if you change to a custom role you don't start with nothing. 2015-12-25 15:56:29 -08:00
redmatrix
b1a77b2235 don't send wall-post notifications when creating webpages on another channel 2015-12-25 14:59:46 -08:00
redmatrix
6db6fef29f spelling 2015-12-25 14:56:06 -08:00
redmatrix
31fbd19c86 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-12-25 14:32:16 -08:00
redmatrix
a085f4df7f regression: default inherited permission was not being set for a connection 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. 2015-12-25 14:25:58 -08:00
jeroenpraat
cd2c6779b7 update es-es strings 2015-12-25 17:37:05 +01:00
redmatrix
d39cd088a1 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-12-24 14:41:47 -08:00
redmatrix
e98fcf68f0 issue #235 2015-12-24 14:41:18 -08:00
jeroenpraat
7d5e066056 After reading and talking with experts I came to the conclusion that es-es 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 2015-12-24 15:29:52 +01:00
jeroenpraat
ba920260b8 reverted my previous commit. this is going to be fixed remotely upstream. Meanwhile es points to .es-419. See https://github.com/redmatrix/hubzilla/issues/234#issuecomment-166961958. 2015-12-23 19:18:46 +01:00
jeroenpraat
2988d96cf0 Spanish language codes. See issue #234 2015-12-23 16:41:22 +01:00
redmatrix
36717e5f32 start on refactor of plugin/theme/widget info block parsing 2015-12-22 19:53:00 -08:00
jeroenpraat
4dff54bcb8 update es+nl strings 2015-12-22 19:29:52 +01:00
redmatrix
7a9fe0907a make the queue api accessible to addons 2015-12-21 17:00:42 -08:00
redmatrix
bc5a675cdf Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-12-20 14:57:01 -08:00
redmatrix
f23e8f8d41 merge hell 2015-12-20 14:55:43 -08:00
redmatrix
61fa97baab Merge branch 'HaakonME-master' 2015-12-20 14:54:08 -08:00
redmatrix
047163b884 Merge pull request #232 from wave72/master
Added 'invitation_only' to site info
2015-12-21 06:14:33 +11:00
Haakon Meland Eriksen
6409237b29 Updated Norwegian strings for Hubzilla 2015-12-20 14:42:14 +01:00
wave72
598a428c6b Added 'invitation_only' to site info 2015-12-20 14:41:49 +01:00
Haakon Meland Eriksen
1cfb83f003 Merge remote-tracking branch 'upstream/master' 2015-12-20 14:09:30 +01:00
Wave
2aad4c2cf9 Merge pull request #4 from redmatrix/master
Merge master into dev branch
2015-12-20 10:20:36 +01:00
Wave
e2692a4baa Merge pull request #230 from wave72/master
Updated Italian strings
2015-12-20 10:17:55 +01:00
wave72
474a1267d7 Updated Italian strings 2015-12-20 10:08:43 +01:00
redmatrix
ed5ca9e4cc use realpath to bypass symlinks and check actually directory 2015-12-18 14:55:19 -08:00
redmatrix
8d61efa0e8 allow widget 'packages' as well as individual files 2015-12-18 14:10:06 -08:00
redmatrix
b816a575eb Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-12-18 13:46:38 -08:00
redmatrix
a99d28dea9 sql delete with limit 2015-12-18 13:46:03 -08:00
Haakon Meland Eriksen
628e565a6c Merge remote-tracking branch 'upstream/master' 2015-12-18 16:04:07 +01:00
Mario Vavti
84bf705811 update smarty to 3.1.28 stable 2015-12-18 11:33:34 +01:00
Haakon Meland Eriksen
a721f39945 Commented out extra addons, themes etc. 2015-12-18 07:24:05 +01:00
redmatrix
1b9722c65a loop detection 2015-12-17 18:16:46 -08:00
redmatrix
62a60e5542 more work on media uploads via api 2015-12-17 16:22:13 -08:00
redmatrix
539d06f02d Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-12-17 14:27:07 -08:00
redmatrix
9c23fe5ab6 issue #228 2015-12-17 14:26:42 -08:00
Mario Vavti
f78e9001f3 fix search item attachment rendering 2015-12-17 19:39:26 +01:00
zzottel
dee1841394 Merge pull request #227 from zzottel/master
add forgotten German docs
2015-12-17 14:33:38 +01:00