Andrew Manning
|
688171d016
|
Rename page feature added. Fixed bug in git commit function and other minor fixes.
|
2016-06-15 06:25:31 -04: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 |
|
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
|
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 |
|
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
|
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 |
|
Andrew Manning
|
a1183bf09a
|
Merge remote-tracking branch 'upstream/dev' into embedphotos
|
2016-06-12 14:38:48 -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
|
0cada39c8a
|
css fixes
|
2016-06-11 20:31:37 +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 |
|
redmatrix
|
c55a7b5f36
|
changelog update
|
2016-06-10 03:16:15 -07:00 |
|
hubzilla
|
beb55235c6
|
Merge pull request #410 from anaqreon/wiki
Wiki module: first iteration
|
2016-06-10 20:03:08 +10:00 |
|
redmatrix
|
cf415a4312
|
strings update
|
2016-06-10 01:18:52 -07:00 |
|
redmatrix
|
bb3d56a0b2
|
foreach: invalid argument
|
2016-06-09 22:07:27 -07:00 |
|
redmatrix
|
8f181bb188
|
change loglevel
|
2016-06-09 20:28:37 -07:00 |
|
redmatrix
|
135d84ba37
|
several "to-do" updates
|
2016-06-09 19:06:31 -07:00 |
|
redmatrix
|
77442dfcdc
|
add safemode tool
|
2016-06-09 18:34:25 -07:00 |
|
redmatrix
|
ed597146fa
|
Create the initial 1.8 changelog entry (subject to further changes)
|
2016-06-09 18:31:42 -07:00 |
|
Andrew Manning
|
7a242f829f
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-06-09 20:07:09 -04:00 |
|
Andrew Manning
|
7fc2b13fe6
|
Stashing changes. Not a functional state.
|
2016-06-09 20:06:36 -04:00 |
|
redmatrix
|
ee5372784e
|
remove the automatic ajax page load on pgdn key; it can load content much faster than you can page and potentially lead to memory exhaustion.
|
2016-06-09 16:45:53 -07:00 |
|
redmatrix
|
0dcea87b99
|
namespace issue with openid reverse auth
|
2016-06-09 16:20:16 -07:00 |
|
redmatrix
|
a10f5e9e06
|
allow an exclusion for transmitting hidden file activities. There may be a better way to do this, but it was pointed out recently that transmitting some hidden activities might cause a problem. I cannot locate the conversation at the moment to summarise the exact issue.
|
2016-06-09 16:11:58 -07:00 |
|
redmatrix
|
2ad5010dc3
|
issue #59
|
2016-06-08 20:00:36 -07:00 |
|
redmatrix
|
40bba93a31
|
potential fix to hubzilla-addons issue 16
|
2016-06-08 19:34:11 -07:00 |
|
Andrew Manning
|
9410b63bbc
|
Revised permissions checks across API and enabled collaborative editing using the write_pages per-channel permission.
|
2016-06-08 06:26:27 -04:00 |
|
Andrew Manning
|
d43a814385
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-06-08 05:41:13 -04:00 |
|
redmatrix
|
e46e7002a8
|
block random_profile from accessing sys channels
|
2016-06-07 22:55:24 -07:00 |
|