Commit graph

15622 commits

Author SHA1 Message Date
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
zottel
a5201a90e8 Merge remote-tracking branch 'upstream/master' 2015-12-17 14:30:34 +01:00
zottel
5f5e4ee6b9 add forgotten German docs 2015-12-17 14:29:35 +01:00
zzottel
cf6519da99 Merge pull request #226 from zzottel/master
help files
2015-12-17 14:28:15 +01:00
zottel
63eaf643a8 small fixes to English docs 2015-12-17 14:27:13 +01:00
zottel
a57a3c709e reorganize German docs to fit the new docs structure
fix mentions of RedMatrix
2015-12-17 14:25:16 +01:00
redmatrix
bcebd1d5b9 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-12-16 22:47:23 -08:00
redmatrix
4cacfe59bd queue/notification/delivery refactor continued 2015-12-16 22:42:33 -08:00
redmatrix
f3ad7b9a16 Merge pull request #225 from zzottel/master
help files
2015-12-17 10:39:49 +11:00
redmatrix
b909c878b1 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-12-16 14:49:20 -08:00
redmatrix
b155f2260f some notifier optimisations. Also put a fixme on the invite total generations for new accounts, which is incorrect and now commented out. 2015-12-16 14:47:30 -08:00
zottel
63256bc9b2 small fixes in English help files 2015-12-16 17:00:05 +01:00
zottel
87519e107a updates to some German help files 2015-12-16 16:59:17 +01:00
zzottel
a38710aa4e Merge pull request #224 from zzottel/master
update to German strings
2015-12-16 14:01:33 +01:00
zottel
020fea3031 update to German strings 2015-12-16 14:00:23 +01:00
zzottel
b4102489aa Merge pull request #223 from zzottel/master
remove directory red.zottel.red, add hubzilla.zottel.net instead
2015-12-16 12:32:17 +01:00
Wave
871ee0f571 Merge pull request #222 from wave72/master
Updated Italian strings
2015-12-16 09:13:40 +01:00
zottel
f0d90005ea remove directory fallback server red.zottel.red, add hubzilla.zottel.net instead 2015-12-16 09:06:20 +01:00
Paolo Tacconi
933e105f32 Updated Italian strings 2015-12-16 09:00:27 +01:00
redmatrix
9b4e6e1ec0 some more minor api tweaks 2015-12-15 20:21:40 -08:00