harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,707 Commits 6 Branches 36 Tags
007836f514b5e268078bf20bd95fe260fb76fb4f
Commit Graph
17707 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
hubzillaandGitHub 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
hubzillaandGitHub 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 Manningandredmatrix 410f5389ae Apply purify_html to page content before preview and save to prevent JavaScript code injection. 2016-06-12 15:18:43 -07:00
hubzillaandGitHub 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
hubzillaandGitHub beb55235c6 Merge pull request #410 from anaqreon/wiki 
Wiki module: first iteration
 2016-06-10 20:03:08 +10:00
Mario Vavti 9d5d3a9468 Merge branch 'dev' into sabre32 2016-06-10 10:45:09 +02: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 d5d5d78e3a initial perms work 2016-06-09 16:16:56 -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
Mario Vavti 85e82e919e more style work 2016-06-09 22:05:52 +02:00
zottel 376ad1f024 Merge remote-tracking branch 'upstream/dev' into dev 2016-06-09 18:01:02 +02:00