harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,913 Commits 6 Branches 36 Tags
a2a87fec54e9da8defea30b8e252a8691a83dfc0
Commit Graph
16913 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
redmatrix a2a87fec54 code comments 2016-06-15 22:36:00 -07:00
redmatrix d457f11717 custom request methods for curl 2016-06-15 21:25:26 -07:00
redmatrix bc5f73e6c3 provide a default for undefined languages 2016-06-15 20:51:55 -07:00
redmatrix 1dc35db1fe ignore case in language names and add 'js' as an alias for 'javascript' 2016-06-15 20:25:19 -07:00
redmatrix 427badcae9 improve readability of comments 2016-06-15 20:09:40 -07:00
hubzillaandGitHub e0b705fd54 Merge pull request #422 from anaqreon/wiki 
Wiki rename page feature added. Bug fixes related to git commits.
 2016-06-16 13:01:49 +10:00
redmatrix 854c23a751 This was the reason for the large line widths - an extra linefeed after each li element 2016-06-15 19:59:30 -07:00
redmatrix fa48de33c2 provide syntax based [colour] highlighting on code blocks for popular languages. I'm not happy with the line height on the list elements but couldn't see where this was defaulted. This uses the syntax [code=xxx]some code snippet[/code], where xxx represents a code/language style - with about 18 builtins. 2016-06-15 19:44:15 -07:00
Andrew Manning fc7c4e64ff Merge remote-tracking branch 'upstream/dev' into wiki 2016-06-15 21:48:47 -04:00
redmatrix 476116a972 translate already imported system apps 2016-06-15 16:24:45 -07:00
redmatrix 47fc0c7958 add new connection to default group when auto-accepted 2016-06-15 05:28:16 -07:00
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
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
hubzillaandGitHub 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
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
hubzillaandGitHub 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
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 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
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
hubzillaandGitHub 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