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

Commit Graph

  • 7e30c1dd82 update smarty to version 3.1.29 Mario Vavti 2016-04-23 21:24:22 +02:00
  • 78bf4564f2 make the link to /help in dropdown conditional to the use of context help Mario Vavti 2016-04-23 17:22:39 +02:00
  • 665a517a47 bump std version to prevent issues with context help js changes Mario Vavti 2016-04-23 16:55:55 +02:00
  • 57110cbe76 pull-right is not needed here Mario Vavti 2016-04-23 16:52:02 +02:00
  • b0a2e5d3f7 simplify context help js and move it to main.js where all the nav related js resides, do not close the context help if we click outside of it - members might want to work on something while help is open, move the link to /help to dropdown-menu. Mario Vavti 2016-04-23 16:39:56 +02:00
  • f3eae7132f Merge branch 'dev' of https://github.com/redmatrix/hubzilla into help-content Andrew Manning 2016-04-23 07:36:06 -04:00
  • 0463df62f0 only display help button in collapsed panel if context help is enabled Mario Vavti 2016-04-23 13:21:25 +02:00
  • a8823ae7d8 Merge branch 'master' into dev redmatrix 2016-04-23 00:06:30 -07:00
  • fdef224da1 Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge redmatrix 2016-04-23 00:05:33 -07:00
  • 59c642ed19 revup redmatrix 2016-04-23 00:05:12 -07:00
  • 2b91962b32 Merge pull request #352 from phellmes/de20160422 redmatrix 2016-04-23 07:46:44 +10:00
  • 61e695e143 Update DE translation strings phellmes 2016-04-22 20:00:14 +02:00
  • aab9218558 Added help content Andrew Manning 2016-04-22 11:50:46 -04:00
  • c250cb955e Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-04-22 00:51:49 -07:00
  • f111275ddf Merge branch 'master' into dev redmatrix 2016-04-22 00:51:32 -07:00
  • 2726c68b60 revup redmatrix 2016-04-22 00:50:42 -07:00
  • 1288a72963 more doco redmatrix 2016-04-22 00:50:19 -07:00
  • d66f6c8e8c make it icon-question-sign for contextual and icon-question for normal help instead of adding a caret-down Mario Vavti 2016-04-22 09:16:17 +02:00
  • a3ce194bf5 Some issues discovered with linkinfo module, and update the doco about using object modules in addons; as there were a couple of surprises. redmatrix 2016-04-21 22:16:57 -07:00
  • 5a427dcee3 No idea how long RSD (Really Simple Discovery) has been broken. I had no idea it was even here. redmatrix 2016-04-21 20:14:55 -07:00
  • 7d45f63b78 updated help/plugins to reflect some of the new interfaces and procedures redmatrix 2016-04-21 17:53:56 -07:00
  • 540800da95 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-04-21 17:09:13 -07:00
  • 1ff189ee90 new hook interface (the old one still works but requires handlers to have two calling arguments; the first of which is no longer used). The new interface is called from Zotlabs\Extend\Hook::register() and allows you to specify which hook version to use. The default will be the new interface with one function argument. We also implement the hook priority field which was always there but needed to be set manually in the DB. This provides a way for two hook handlers that implement the same hook interface to determine which order to be called in the event of conflicts. redmatrix 2016-04-21 17:03:05 -07:00
  • 692e41c41e provide a way for the router to support custom controller objects and allow plugins to register class objects as modules instead of the traditional procedural interface. redmatrix 2016-04-21 16:09:25 -07:00
  • cb8c83a42b remove obsolete class Mario Vavti 2016-04-21 23:56:53 +02:00
  • bd11b1d61a indicate if we will be displayed contextual help or default help Mario Vavti 2016-04-21 23:55:38 +02:00
  • 96d19c09f3 fix help button for collapsed state Mario Vavti 2016-04-21 23:19:17 +02:00
  • d7f4bfedd5 some fixes for contextual help and disable transition animation for now - it looked really wired because main moved with a different speed than help-content and help-content can not be displayed under the panel as it is implemented now. Mario Vavti 2016-04-21 23:03:09 +02:00
  • 391ed8655e Merge pull request #351 from anaqreon/toggle-context-help git-marijus 2016-04-21 18:44:50 +02:00
  • aa0c70e198 Merge pull request #348 from git-marijus/dev git-marijus 2016-04-21 18:42:49 +02:00
  • 82de68c3d3 Added admin/site setting that toggles context help panel. If disabled, original help menu button behavior is restored. Andrew Manning 2016-04-21 06:41:55 -04:00
  • 4669107634 Merge branch 'master' into dev redmatrix 2016-04-21 01:08:38 -07:00
  • cf79c4ea48 Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge redmatrix 2016-04-21 01:08:00 -07:00
  • ae932922c4 revup #337 redmatrix 2016-04-21 01:07:46 -07:00
  • bacd05ea9e Merge pull request #349 from HaakonME/master git-marijus 2016-04-21 09:14:32 +02:00
  • 657b34c012 change the 404 warning from the router to reflect the new architecture redmatrix 2016-04-20 22:50:59 -07:00
  • 5eb594706b make the cookie check agnostic to cookie state redmatrix 2016-04-20 22:17:02 -07:00
  • 2b0a04ea9e revert the reversal of checkjs logic, but still restrict the behaviour scope to just those urls that require it redmatrix 2016-04-20 22:10:00 -07:00
  • f00a701ad1 send the correct number of args redmatrix 2016-04-20 19:56:01 -07:00
  • dff9e18c1e We no longer require the diaspora_meta service locally. redmatrix 2016-04-20 19:54:26 -07:00
  • d2f67bf249 Merge branch 'dmeta' into dev several diaspora changes/fixes redmatrix 2016-04-20 19:06:36 -07:00
  • 8f64b28fb9 upgrade std rev redmatrix 2016-04-20 19:06:19 -07:00
  • 0d91f363cc There is no longer a followup flag in the notifier. Remove all traces of it. redmatrix 2016-04-20 19:03:56 -07:00
  • 23180ae078 Merge branch 'dev' into dmeta redmatrix 2016-04-20 18:16:15 -07:00
  • b96eb1c823 Merge branch 'dev' into toggle-context-help Andrew Manning 2016-04-20 21:05:01 -04:00
  • 635580091a Merge branch 'master' into dev redmatrix 2016-04-20 17:43:20 -07:00
  • a768bb1ab2 Merge branch 'master' into dev redmatrix 2016-04-20 17:41:51 -07:00
  • 59799ba2b4 some crossbrowser rendering work on the comment box Mario Vavti 2016-04-20 21:59:29 +02:00
  • 8147e6203f Use stopImmidiatePropagation() only if we are in a list to not interfere with other keypress listeners (e.g. chat). Mario Vavti 2016-04-20 14:13:09 +02:00
  • 2641980ac2 bb2d updates from testing signature changes redmatrix 2016-04-20 01:40:09 -07:00
  • 683da1aa77 revup #337 redmatrix 2016-04-20 01:19:13 -07:00
  • 21b0128e9e testing dmeta redmatrix 2016-04-19 23:06:43 -07:00
  • d07afb54e4 rework bb2diaspora for eradicating the diaspora comment virus redmatrix 2016-04-19 21:43:12 -07:00
  • 1e8b3fe749 Revert the last edit on this file. Need to work this through a bit more before changing this bit. redmatrix 2016-04-19 20:02:55 -07:00
  • 9040ee53e4 missing class instance pointer in Pconfig module upgrade redmatrix 2016-04-19 19:09:35 -07:00
  • 974390d5d2 remove test files which were committed by accident redmatrix 2016-04-19 19:02:48 -07:00
  • 8a57b845ae second phase of diaspora comment virus eradication begins redmatrix 2016-04-19 17:03:14 -07:00
  • 324771f858 Merge branch 'master' into dev redmatrix 2016-04-19 15:51:41 -07:00
  • dd7fdf0c2b Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge redmatrix 2016-04-19 13:04:59 -07:00
  • bb7b756974 revup #337 redmatrix 2016-04-19 13:04:44 -07:00
  • e805f589aa Updated Hubzilla on OpenShift deploy script to include unofficial repos by appending the 'insecure' argument Haakon Meland Eriksen 2016-04-19 19:23:40 +02:00
  • 6941fbb182 add querystring to css and js which is added via head_add_{css, js} Mario Vavti 2016-04-19 13:38:06 +02:00
  • 7594796ee1 Try toggling context help using onclick attribute Andrew Manning 2016-04-19 05:52:16 -04:00
  • f53478f142 a bit more namespace wrangling redmatrix 2016-04-18 20:47:11 -07:00
  • 2a4e8972e0 module updates redmatrix 2016-04-18 20:38:38 -07:00
  • 2a61817bad Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-04-18 19:17:20 -07:00
  • e47a473e2c Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2016-04-18 18:07:20 +02:00
  • 094d4cc325 Merge branch 'master' into dev Mario Vavti 2016-04-18 16:45:58 +02:00
  • a49fa5f87c bring back bbcode buttons for mod/editpost Mario Vavti 2016-04-18 16:45:34 +02:00
  • ca59ecd107 Merge branch 'master' into dev Mario Vavti 2016-04-18 10:57:20 +02:00
  • f761ea5fc9 fix rpost bbcode buttons and autocomplete Mario Vavti 2016-04-18 10:56:51 +02:00
  • 1698732cff convert all the _well_known service controllers which are a bit touchy when it comes to the router redmatrix 2016-04-18 01:35:09 -07:00
  • a9f68e4d2a Merge branch 'master' into dev redmatrix 2016-04-18 01:02:44 -07:00
  • f12af17238 revup #337 redmatrix 2016-04-18 01:02:03 -07:00
  • d1ecf3f323 some issues with GNU-Social's implementation of events in feeds. The summary element is over-riding content, so put summary into the xcal namespace. Some investigation reveals that both projects are non-compliant in the xcal space. Will deal with this later. redmatrix 2016-04-18 00:59:42 -07:00
  • 9cddbc9a47 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-04-17 19:58:59 -07:00
  • 966773cdbb pull in the new object router and a few selected samples for the new controller layout redmatrix 2016-04-17 19:55:36 -07:00
  • d2e61122c5 Merge commit '521d404' into dev redmatrix 2016-04-17 19:42:43 -07:00
  • 7229cd56ed Making sure the great new context help works with all thmes and schema's (3rd party themes: maybe abit of tweaking is still needed). Also fixing some minor cosmetic things. jeroenpraat 2016-04-18 01:57:54 +02:00
  • 521d404013 remove the date hack on public feeds which was a temporary fix for an issue limiting the number of posts returned and no longer needed. redmatrix 2016-04-17 16:37:44 -07:00
  • 5591eac973 Merge pull request #345 from anaqreon/context-help redmatrix 2016-04-18 06:47:57 +10:00
  • c8dec1fae5 Spanish and Dutch strings update jeroenpraat 2016-04-17 19:27:40 +02:00
  • c366bbaa54 Merge branch 'master' into dev redmatrix 2016-04-17 04:31:20 -07:00
  • 72e7c50968 revup #337 redmatrix 2016-04-17 04:29:50 -07:00
  • f4cca21fdf Recover lost language translation accommodation and doc/context restructuring Andrew Manning 2016-04-17 07:29:08 -04:00
  • d7fe48d1b6 New help panel that slides in from the top and pushes the content down so it is not covered. Panel toggles with help button. Still some bugs with small screen viewing. Andrew Manning 2016-04-17 07:09:42 -04:00
  • fddacf0a5a Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2016-04-16 15:18:31 +02:00
  • 08a651dc9d Merge branch 'master' into dev redmatrix 2016-04-16 00:39:29 -07:00
  • 65571249b2 revup #337 redmatrix 2016-04-16 00:38:45 -07:00
  • b4205554a8 Commented out extra repos except official addons Haakon Meland Eriksen 2016-04-16 09:29:31 +02:00
  • 0865d0ef51 Convert Channel to new module redmatrix 2016-04-15 22:36:07 -07:00
  • b57f69d14d cleanup and test of new router redmatrix 2016-04-15 20:43:05 -07:00
  • 07650b4646 get init() working with class modules redmatrix 2016-04-15 16:13:55 -07:00
  • ce582ccada Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-04-15 14:27:44 -07:00
  • ee5163ce64 Merge branch 'master' into dev redmatrix 2016-04-15 14:27:28 -07:00
  • bbe33f9503 Merge branch 'master' into dev Mario Vavti 2016-04-15 12:42:12 +02:00
  • 2cb04ccb8f nav: move js and css out of template, provide a help button in the panel on small screens and lots of whitespace cleanup Mario Vavti 2016-04-15 12:39:22 +02:00
  • aaa327ca05 testing the new router/module code redmatrix 2016-04-15 01:25:15 -07:00
  • ce34c4086d Merge branch 'master' of https://github.com/redmatrix/hubzilla Mario Vavti 2016-04-15 09:53:34 +02:00
  • fe9df64fc2 fix some slight crossbrowser rendering issues with jot Mario Vavti 2016-04-15 09:52:40 +02:00