harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • e5f4d80bbe Merge remote-tracking branch 'upstream/dev' into dev Andrew Manning 2016-06-16 19:45:02 -04:00
  • aa77b04860 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-06-16 05:08:26 -07:00
  • 5b479d63d6 Merge branch 'dev' into sabre32 Mario Vavti 2016-06-16 12:22:32 +02:00
  • 8924f94d05 show month view in full height in fullscreen view Mario Vavti 2016-06-16 12:21:59 +02:00
  • a873b7b6e8 mrge branch 'dev' into sabre32 Mario Vavti 2016-06-16 11:37:16 +02:00
  • 7baa20d559 fix scrollbars Mario Vavti 2016-06-16 11:36:51 +02:00
  • 2b7f114c2d Merge branch 'dev' into sabre32 Mario Vavti 2016-06-16 11:22:52 +02:00
  • 951bf5ec2e update 3rd party lib fullcalendar to version 2.7.3 Mario Vavti 2016-06-16 11:22:08 +02:00
  • 28a7458e48 Merge branch 'dev' into sabre32 Mario Vavti 2016-06-16 10:26:47 +02:00
  • e25bd28b73 Merge remote-tracking branch 'upstream/dev' into dev zottel 2016-06-16 10:24:24 +02:00
  • a2a87fec54 code comments redmatrix 2016-06-15 22:36:00 -07:00
  • d457f11717 custom request methods for curl redmatrix 2016-06-15 21:25:26 -07:00
  • bc5f73e6c3 provide a default for undefined languages redmatrix 2016-06-15 20:51:55 -07:00
  • 1dc35db1fe ignore case in language names and add 'js' as an alias for 'javascript' redmatrix 2016-06-15 20:25:19 -07:00
  • 427badcae9 improve readability of comments redmatrix 2016-06-15 20:09:40 -07:00
  • e0b705fd54 Merge pull request #422 from anaqreon/wiki hubzilla 2016-06-16 13:01:49 +10:00
  • 854c23a751 This was the reason for the large line widths - an extra linefeed after each li element redmatrix 2016-06-15 19:59:30 -07:00
  • 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. redmatrix 2016-06-15 19:44:15 -07:00
  • fc7c4e64ff Merge remote-tracking branch 'upstream/dev' into wiki Andrew Manning 2016-06-15 21:48:47 -04:00
  • d9aa16aa82 Merge branch '1.8RC' of https://github.com/redmatrix/hubzilla into 1.8RC_merge redmatrix 2016-06-15 16:25:39 -07:00
  • 976e32d3ae translate already imported system apps redmatrix 2016-06-15 16:24:45 -07:00
  • 476116a972 translate already imported system apps redmatrix 2016-06-15 16:24:45 -07:00
  • f2dda646ec Merge remote-tracking branch 'upstream/dev' into dev Andrew Manning 2016-06-15 19:15:47 -04:00
  • 05ed20d336 Merge branch 'dev' into sabre32 Mario Vavti 2016-06-15 17:34:03 +02:00
  • b0476be36f All languages up to date as far as they are updated. Added Hebrew (I saw no RTL on my browser, but maybe that's a locale setting or else it's not yet implemented in HZ). Removed Esperanto and Czech (they where old ones from Friendica and are not on Transifex (yet)). jeroenpraat 2016-06-15 17:26:44 +02:00
  • a005088228 Merge branch '1.8RC' of https://github.com/redmatrix/hubzilla into 1.8RC_merge redmatrix 2016-06-15 05:30:19 -07:00
  • ef1c01d968 add new connection to default group when auto-accepted redmatrix 2016-06-15 05:28:16 -07:00
  • 47fc0c7958 add new connection to default group when auto-accepted redmatrix 2016-06-15 05:28:16 -07:00
  • a9f690260a Merge pull request #420 from phellmes/de20160615 Jeroen van Riet Paap 2016-06-15 13:53:02 +02:00
  • 688171d016 Rename page feature added. Fixed bug in git commit function and other minor fixes. Andrew Manning 2016-06-15 06:25:31 -04:00
  • a16dcc877c Update DE translation strings phellmes 2016-06-15 12:12:18 +02:00
  • 9a0dff08bc Merge branch 'dev' into sabre32 Mario Vavti 2016-06-15 08:42:51 +02:00
  • 77dedf6648 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-06-14 20:31:10 -07:00
  • 212d8b6cfd support cookie auth in Sabre DAV redmatrix 2016-06-14 20:30:34 -07:00
  • 9eb23a1208 Merge pull request #419 from anaqreon/wiki hubzilla 2016-06-15 10:06:08 +10:00
  • 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. redmatrix 2016-06-14 17:04:29 -07:00
  • e5a919c32e Fix Spanish wiki translation Andrew Manning 2016-06-14 19:58:33 -04:00
  • eeaafe9f39 Merge remote-tracking branch 'upstream/dev' into wiki Andrew Manning 2016-06-14 19:56:04 -04:00
  • 6430a232f8 Add Italian wiki context help translation Andrew Manning 2016-06-14 19:55:31 -04:00
  • 24569a18db css fix Mario Vavti 2016-06-14 23:21:26 +02:00
  • 5c458e9111 Merge branch 'dev' into sabre32 Mario Vavti 2016-06-14 09:42:43 +02:00
  • 0ef2622621 some work to provide propagation and honouring of the item_notshown flag. redmatrix 2016-06-13 22:09:22 -07:00
  • 1ff9abe1b4 missing iconfig conversion redmatrix 2016-06-13 21:16:36 -07:00
  • 8e5948716e Merge pull request #418 from anaqreon/wiki hubzilla 2016-06-14 13:03:30 +10:00
  • 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. redmatrix 2016-06-13 19:58:24 -07:00
  • 1bec739195 Missing space in Spanish translation Andrew Manning 2016-06-13 21:59:51 -04:00
  • 025a7d2f0f Missing onclick attributes in German translation Andrew Manning 2016-06-13 21:57:48 -04:00
  • ebf238be5d Move Spanish context help translation from es to es-es and make es a symlink to es-es Andrew Manning 2016-06-13 21:47:05 -04:00
  • 98484f0def Move Spanish context help translation from es to es-es and make es a symlink to es-es Andrew Manning 2016-06-13 21:42:00 -04:00
  • 892f061ad6 Merge remote-tracking branch 'upstream/dev' into wiki Andrew Manning 2016-06-13 20:48:57 -04:00
  • 8bfb620a13 Add DE and ES-ES translations for wiki context help Andrew Manning 2016-06-13 20:48:19 -04:00
  • b6d425838f css fixes Mario Vavti 2016-06-13 17:19:49 +02:00
  • a83f13269f Merge remote-tracking branch 'upstream/dev' into dev zottel 2016-06-13 09:51:47 +02:00
  • e963714ad6 Merge branch 'dev' into sabre32 Mario Vavti 2016-06-13 09:18:39 +02:00
  • 6d4188f05e Merge pull request #417 from anaqreon/wiki hubzilla 2016-06-13 12:10:20 +10:00
  • 3e804757c1 Context help for wiki interface Andrew Manning 2016-06-12 21:15:52 -04:00
  • cc43a49b6d Merge remote-tracking branch 'upstream/dev' into wiki Andrew Manning 2016-06-12 20:24:26 -04:00
  • b18b9464a4 Merge pull request #416 from anaqreon/embedphotos hubzilla 2016-06-13 10:15:09 +10:00
  • 71d4f65cb2 Move javascript functions back to jot-header.tpl Andrew Manning 2016-06-12 20:10:37 -04:00
  • b5933e9d44 Photo embed button with album browser works in new post editor. Andrew Manning 2016-06-12 19:41:37 -04:00
  • 7abfe716b4 DB schema issue with import redmatrix 2016-06-12 16:34:27 -07:00
  • 81b3c59711 DB schema issue with import redmatrix 2016-06-12 16:34:27 -07:00
  • 410f5389ae Apply purify_html to page content before preview and save to prevent JavaScript code injection. Andrew Manning 2016-06-12 07:17:23 -04:00
  • 290a14d29e Merge pull request #414 from anaqreon/1.8RC hubzilla 2016-06-13 08:16:26 +10:00
  • a1183bf09a Merge remote-tracking branch 'upstream/dev' into embedphotos Andrew Manning 2016-06-12 14:38:48 -04:00
  • e109abbef7 Apply purify_html to page content before preview and save to prevent JavaScript code injection. Andrew Manning 2016-06-12 07:17:23 -04:00
  • 43055e0199 Apply purify_html to page content before preview and save to prevent JavaScript code injection. Andrew Manning 2016-06-12 07:14:12 -04:00
  • 1789c3242a Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-06-11 15:29:25 -07:00
  • f41380de77 remove debugging redmatrix 2016-06-11 15:28:52 -07:00
  • 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. redmatrix 2016-06-11 15:23:13 -07:00
  • ef95c68b4f Merge branch 'dev' into sabre32 Mario Vavti 2016-06-11 20:33:03 +02:00
  • 0cada39c8a css fixes Mario Vavti 2016-06-11 20:31:37 +02:00
  • bdbbe00bdf Merge branch 'dev' into sabre32 Mario Vavti 2016-06-11 20:12:41 +02:00
  • a1241daa41 es_ES and NL string for 1.8RC. Hopefully I'm doing it right. jeroenpraat 2016-06-11 17:58:37 +02:00
  • 1f43da2ade Merge branch '1.8RC' of https://github.com/redmatrix/hubzilla into 1.8RC jeroenpraat 2016-06-11 17:54:26 +02:00
  • 1614dbf6ae iconfig sharing not set correctly redmatrix 2016-06-10 22:41:58 -07:00
  • 96cd63cf1a iconfig sharing not set correctly redmatrix 2016-06-10 22:41:58 -07:00
  • 974ca9d526 move dev forward redmatrix 2016-06-10 14:26:14 -07:00
  • 86985b454f Merge branch 'dev' into sabre32 Mario Vavti 2016-06-10 12:22:01 +02:00
  • c55a7b5f36 changelog update redmatrix 2016-06-10 03:16:15 -07:00
  • beb55235c6 Merge pull request #410 from anaqreon/wiki hubzilla 2016-06-10 20:03:08 +10:00
  • 9d5d3a9468 Merge branch 'dev' into sabre32 Mario Vavti 2016-06-10 10:45:09 +02:00
  • cf415a4312 strings update redmatrix 2016-06-10 01:18:52 -07:00
  • bb3d56a0b2 foreach: invalid argument redmatrix 2016-06-09 22:07:27 -07:00
  • 8f181bb188 change loglevel redmatrix 2016-06-09 20:28:37 -07:00
  • 135d84ba37 several "to-do" updates redmatrix 2016-06-09 19:06:31 -07:00
  • 77442dfcdc add safemode tool redmatrix 2016-06-09 18:34:25 -07:00
  • ed597146fa Create the initial 1.8 changelog entry (subject to further changes) redmatrix 2016-06-09 18:31:42 -07:00
  • 7a242f829f Merge remote-tracking branch 'upstream/dev' into wiki Andrew Manning 2016-06-09 20:07:09 -04:00
  • 7fc2b13fe6 Stashing changes. Not a functional state. Andrew Manning 2016-06-09 20:06:36 -04:00
  • 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. redmatrix 2016-06-09 16:45:53 -07:00
  • 0dcea87b99 namespace issue with openid reverse auth redmatrix 2016-06-09 16:20:16 -07:00
  • d5d5d78e3a initial perms work redmatrix 2016-06-09 16:16:56 -07:00
  • 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. redmatrix 2016-06-09 16:11:58 -07:00
  • 85e82e919e more style work Mario Vavti 2016-06-09 22:05:52 +02:00
  • 376ad1f024 Merge remote-tracking branch 'upstream/dev' into dev zottel 2016-06-09 18:01:02 +02:00
  • 9b96fe66a6 Merge branch 'sabre32' of https://github.com/redmatrix/hubzilla into sabre32 Mario Vavti 2016-06-09 09:10:46 +02:00
  • 11045b92fb Merge branch 'dev' into sabre32 Mario Vavti 2016-06-09 09:09:13 +02:00
  • 2ad5010dc3 issue #59 redmatrix 2016-06-08 20:00:36 -07:00
  • 40bba93a31 potential fix to hubzilla-addons issue 16 redmatrix 2016-06-08 19:34:11 -07:00