phellmes
|
a16dcc877c
|
Update DE translation strings
|
2016-06-15 12:12:18 +02:00 |
|
Mario Vavti
|
9a0dff08bc
|
Merge branch 'dev' into sabre32
|
2016-06-15 08:42:51 +02:00 |
|
redmatrix
|
77dedf6648
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-06-14 20:31:10 -07:00 |
|
redmatrix
|
212d8b6cfd
|
support cookie auth in Sabre DAV
|
2016-06-14 20:30:34 -07:00 |
|
hubzilla
|
9eb23a1208
|
Merge pull request #419 from anaqreon/wiki
Wiki context help translations IT and ES-ES
|
2016-06-15 10:06:08 +10:00 |
|
redmatrix
|
ccfd028919
|
readme for the module directory, also provide an undocumented way to reset the timestamp on connection photos to force a refresh without messing with the database directly.
|
2016-06-14 17:04:29 -07:00 |
|
Andrew Manning
|
e5a919c32e
|
Fix Spanish wiki translation
|
2016-06-14 19:58:33 -04:00 |
|
Andrew Manning
|
eeaafe9f39
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-06-14 19:56:04 -04:00 |
|
Andrew Manning
|
6430a232f8
|
Add Italian wiki context help translation
|
2016-06-14 19:55:31 -04:00 |
|
Mario Vavti
|
24569a18db
|
css fix
|
2016-06-14 23:21:26 +02:00 |
|
Mario Vavti
|
5c458e9111
|
Merge branch 'dev' into sabre32
|
2016-06-14 09:42:43 +02:00 |
|
redmatrix
|
0ef2622621
|
some work to provide propagation and honouring of the item_notshown flag.
|
2016-06-13 22:09:22 -07:00 |
|
redmatrix
|
1ff9abe1b4
|
missing iconfig conversion
|
2016-06-13 21:16:36 -07:00 |
|
hubzilla
|
8e5948716e
|
Merge pull request #418 from anaqreon/wiki
Wiki context help translations DE and ES-ES
|
2016-06-14 13:03:30 +10:00 |
|
redmatrix
|
1e68d4fb75
|
deprecate the item_id table - replace with iconfig. A possibly useful function in the iconfig class would be a search which takes a service id and type and uid, matches against an item and returns the iid. That could save a bit of code duplication.
|
2016-06-13 19:58:24 -07:00 |
|
Andrew Manning
|
1bec739195
|
Missing space in Spanish translation
|
2016-06-13 21:59:51 -04:00 |
|
Andrew Manning
|
025a7d2f0f
|
Missing onclick attributes in German translation
|
2016-06-13 21:57:48 -04:00 |
|
Andrew Manning
|
ebf238be5d
|
Move Spanish context help translation from es to es-es and make es a symlink to es-es
|
2016-06-13 21:47:05 -04:00 |
|
Andrew Manning
|
98484f0def
|
Move Spanish context help translation from es to es-es and make es a symlink to es-es
|
2016-06-13 21:42:00 -04:00 |
|
Andrew Manning
|
892f061ad6
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-06-13 20:48:57 -04:00 |
|
Andrew Manning
|
8bfb620a13
|
Add DE and ES-ES translations for wiki context help
|
2016-06-13 20:48:19 -04:00 |
|
Mario Vavti
|
b6d425838f
|
css fixes
|
2016-06-13 17:19:49 +02:00 |
|
zottel
|
a83f13269f
|
Merge remote-tracking branch 'upstream/dev' into dev
|
2016-06-13 09:51:47 +02:00 |
|
Mario Vavti
|
e963714ad6
|
Merge branch 'dev' into sabre32
|
2016-06-13 09:18:39 +02:00 |
|
hubzilla
|
6d4188f05e
|
Merge pull request #417 from anaqreon/wiki
Wiki context help first draft
|
2016-06-13 12:10:20 +10:00 |
|
Andrew Manning
|
3e804757c1
|
Context help for wiki interface
|
2016-06-12 21:15:52 -04:00 |
|
Andrew Manning
|
cc43a49b6d
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-06-12 20:24:26 -04:00 |
|
hubzilla
|
b18b9464a4
|
Merge pull request #416 from anaqreon/embedphotos
Add embed photos button with album browser to new post editor
|
2016-06-13 10:15:09 +10:00 |
|
Andrew Manning
|
71d4f65cb2
|
Move javascript functions back to jot-header.tpl
|
2016-06-12 20:10:37 -04:00 |
|
Andrew Manning
|
b5933e9d44
|
Photo embed button with album browser works in new post editor.
|
2016-06-12 19:41:37 -04:00 |
|
redmatrix
|
7abfe716b4
|
DB schema issue with import
|
2016-06-12 16:35:17 -07:00 |
|
redmatrix
|
81b3c59711
|
DB schema issue with import
|
2016-06-12 16:34:27 -07:00 |
|
Andrew Manning
|
410f5389ae
|
Apply purify_html to page content before preview and save to prevent JavaScript code injection.
|
2016-06-12 15:18:43 -07:00 |
|
hubzilla
|
290a14d29e
|
Merge pull request #414 from anaqreon/1.8RC
Add filter to wiki content to prevent JavaScript code injection
|
2016-06-13 08:16:26 +10:00 |
|
Andrew Manning
|
a1183bf09a
|
Merge remote-tracking branch 'upstream/dev' into embedphotos
|
2016-06-12 14:38:48 -04:00 |
|
Andrew Manning
|
e109abbef7
|
Apply purify_html to page content before preview and save to prevent JavaScript code injection.
|
2016-06-12 07:17:23 -04:00 |
|
Andrew Manning
|
43055e0199
|
Apply purify_html to page content before preview and save to prevent JavaScript code injection.
|
2016-06-12 07:14:12 -04:00 |
|
redmatrix
|
1789c3242a
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-06-11 15:29:25 -07:00 |
|
redmatrix
|
f41380de77
|
remove debugging
|
2016-06-11 15:28:52 -07:00 |
|
redmatrix
|
0e0a6f5f8d
|
Work supporting issue #411, add an optional priority (int) as a second arg to head_add_js to affect the load ordering, larger numbered priorities will be included after lower numbered ones. Default priority is 0.Note that we treat main.js differently and always add main.js to the page last, regardless of any other
ordering.
|
2016-06-11 15:23:13 -07:00 |
|
Mario Vavti
|
ef95c68b4f
|
Merge branch 'dev' into sabre32
|
2016-06-11 20:33:03 +02:00 |
|
Mario Vavti
|
0cada39c8a
|
css fixes
|
2016-06-11 20:31:37 +02:00 |
|
Mario Vavti
|
bdbbe00bdf
|
Merge branch 'dev' into sabre32
|
2016-06-11 20:12:41 +02:00 |
|
jeroenpraat
|
a1241daa41
|
es_ES and NL string for 1.8RC. Hopefully I'm doing it right.
|
2016-06-11 17:58:37 +02:00 |
|
jeroenpraat
|
1f43da2ade
|
Merge branch '1.8RC' of https://github.com/redmatrix/hubzilla into 1.8RC
|
2016-06-11 17:54:26 +02:00 |
|
redmatrix
|
1614dbf6ae
|
iconfig sharing not set correctly
|
2016-06-10 22:42:59 -07:00 |
|
redmatrix
|
96cd63cf1a
|
iconfig sharing not set correctly
|
2016-06-10 22:41:58 -07:00 |
|
redmatrix
|
974ca9d526
|
move dev forward
|
2016-06-10 14:26:14 -07:00 |
|
Mario Vavti
|
86985b454f
|
Merge branch 'dev' into sabre32
|
2016-06-10 12:22:01 +02:00 |
|
redmatrix
|
c55a7b5f36
|
changelog update
|
2016-06-10 03:16:15 -07:00 |
|