Skip to content

Commit

Permalink
move links
Browse files Browse the repository at this point in the history
  • Loading branch information
pliablepixels committed Aug 8, 2021
1 parent f81d439 commit b2afa15
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 18 deletions.
16 changes: 8 additions & 8 deletions docs/guides/FAQ.rst
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@ Try before buy

Some users legitimately look around for an option to try before they buy
and they are not savvy enough to `download the
code <https://github.com/pliablepixels/zmNinja>`__ and compile (:doc:`source`) for
code <https://github.com/zoneminder/zmninja>`__ and compile (:doc:`source`) for
themselves. Fair enough. In that case, `download the Desktop
version <https://github.com/pliablepixels/zmNinja/releases>`__ of
version <https://github.com/zoneminder/zmninja/releases>`__ of
zmNinja. It's free and is the same code as mobile. Make sure the desktop
version works before you buy the mobile version.

Expand Down Expand Up @@ -181,7 +181,7 @@ How to report errors
hours of frustration (mostly on my side). Thanks

- I have released the desktop version free - download it
`here <https://github.com/pliablepixels/zmNinja/releases>`__. Its
`here <https://github.com/zoneminder/zmninja/releases>`__. Its
always easier to debug on the desktop version - give it a try. If you
hit Shift+Cmd/Ctrl+D it brings up a debug window - it helps debugging

Expand Down Expand Up @@ -378,7 +378,7 @@ times I've had users tell me 'they have checked this list' only to find
out later they skimmed details.

- Always try with the `free desktop
version <https://github.com/pliablepixels/zmNinja/releases>`__ first.
version <https://github.com/zoneminder/zmninja/releases>`__ first.
Enable debug view by hitting Ctrl/Cmd+Shift+D and you can see debug
logs in the console view. I can't emphasize enough how useful this
is.
Expand Down Expand Up @@ -560,7 +560,7 @@ A more complete and more secure option

User `Adam Outler <https://github.com/adamoutler>`__ has contributed the
following process: see
`HERE <https://github.com/pliablepixels/zmNinja/wiki/Apache-Proxy-Authorization-with-HTTPS,-Basic-Auth,-and-ProxyPass>`__.
`HERE <https://github.com/zoneminder/zmninja/wiki/Apache-Proxy-Authorization-with-HTTPS,-Basic-Auth,-and-ProxyPass>`__.
Adam also has this to say about why proxies should be recommended for
HTTPS enabled ZoneMinder instances:

Expand Down Expand Up @@ -947,7 +947,7 @@ all.

When I switch languages, date/time inputs don't follow my locale in zmNinja Desktop
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The only screen I am aware of where there is a date/time input is ``Events->Filter Events``. This happens because the desktop version uses an embedded chromium version which seems to default to ``en-us``. To work around this, you can start the desktop app with a ``--lang='<locale code>'`` option. Example ``--lang='ru'``. Note that you will have to do this each time and is completely related to any language you may choose in zmNinja. Thel language in zmNinja is only used to translate text strings. Nothing else. For an extended discussion see `this issue <https://github.com/pliablepixels/zmNinja/issues/875>`__.
The only screen I am aware of where there is a date/time input is ``Events->Filter Events``. This happens because the desktop version uses an embedded chromium version which seems to default to ``en-us``. To work around this, you can start the desktop app with a ``--lang='<locale code>'`` option. Example ``--lang='ru'``. Note that you will have to do this each time and is completely related to any language you may choose in zmNinja. Thel language in zmNinja is only used to translate text strings. Nothing else. For an extended discussion see `this issue <https://github.com/zoneminder/zmninja/issues/875>`__.

Is zmNinja free?
----------------
Expand Down Expand Up @@ -995,7 +995,7 @@ I want to donate time/expertise/code
------------------------------------

Great. Make sure you read the
`license <https://github.com/pliablepixels/zmNinja/blob/master/LICENSE>`__
`license <https://github.com/zoneminder/zmninja/blob/master/LICENSE>`__
, read the `contributing
guidelines <https://github.com/pliablepixels/zmNinja/blob/master/CONTRIBUTING.md>`__
guidelines <https://github.com/zoneminder/zmninja/blob/master/CONTRIBUTING.md>`__
and if it works for you, happy to see what you'd like to do.
6 changes: 3 additions & 3 deletions docs/guides/contributing-language.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@ Contributing a new language

If you are familiar with using git, I'd prefer if you follow the Pull
Request process
`here <https://github.com/pliablepixels/zmNinja/blob/master/CONTRIBUTING.md#steps-for-code-contribution>`__.
`here <https://github.com/zoneminder/zmninja/blob/master/CONTRIBUTING.md#steps-for-code-contribution>`__.

Adding a new language
^^^^^^^^^^^^^^^^^^^^^

- Languages translations are available
`here <https://github.com/pliablepixels/zmNinja/tree/master/www/lang>`__
`here <https://github.com/zoneminder/zmninja/tree/master/www/lang>`__
- To contribute a new language, add a new ``locale-xx.json`` (where
``xx`` is your language code).
- Ideally, you should also provide a language translation for the
zmNinja help file inside
`lang/help <https://github.com/pliablepixels/zmNinja/tree/master/www/lang/help>`__
`lang/help <https://github.com/zoneminder/zmninja/tree/master/www/lang/help>`__

The best way is to simply look at an existing language translation and
follow the same model for yours. If any language translation keywords
Expand Down
4 changes: 2 additions & 2 deletions docs/guides/source.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Building from Source

**NOTE** If you want to run it on your desktop, you can directly
download desktop binaries
`here <https://github.com/pliablepixels/zmNinja/releases>`__
`here <https://github.com/zoneminder/zmninja/releases>`__
and if you want it for Android/iOS you can get from the play/appstore.
This is only for those who *want* to run from source.

Expand Down Expand Up @@ -88,7 +88,7 @@ Download zmNinja

.. code:: bash
git clone --depth 1 https://github.com/pliablepixels/zmNinja.git
git clone --depth 1 https://github.com/zoneminder/zmninja.git
Add some more build deps:
Expand Down
2 changes: 1 addition & 1 deletion docs/guides/validating-api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Make sure ZM APIs are working:
''''''''''''''''''''''''''''''

**Note 1**: nginx users, if you are facing API issues, please see if `this
page <https://github.com/pliablepixels/zmNinja/wiki/How-to-configure-APIs-with-nginx>`__
page <https://github.com/zoneminder/zmninja/wiki/How-to-configure-APIs-with-nginx>`__
helps)

**Note 2**: It is **important** that you run the API tests from the device you plan to use zmNinja with. Very often, I've seen folks doing API tests on the same server ZM is running on and then face issues (mostly due to network connectivity) when using zmNinja because it is running on a different device. So, I'd recommend you open a chrome browser on the device you plan to use zmNinja on (desktop or mobile) and then run these tests.
Expand Down
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Welcome to zmNinja's documentation!
Event Notification Server <https://zmeventnotification.readthedocs.io/en/latest/index.html>
Help for each screen <https://docs.google.com/document/d/e/2PACX-1vS9z-ANNUbPRMhCWbS-PFJtB_6y6O_vwrZfLE6-TjPo3O0bPQeMUjjeTSXFvILU_w4ZTgU01CM9Hz8p/pub>

`Github Repository <https://github.com/pliablepixels/zmNinja>`__
`Github Repository <https://github.com/zoneminder/zmninja>`__

:doc:`guides/FAQ`
A detailed FAQ for zmNinja, including common issues related to installation, streaming and troubleshooting
Expand Down
2 changes: 1 addition & 1 deletion www/js/EventCtrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -1384,7 +1384,7 @@ angular.module('zmApp.controllers')
// console.log("**************From String: " + $rootScope.fromString);
// console.log("**************To String: " + $rootScope.toString);

// reloading - may solve https://github.com/pliablepixels/zmNinja/issues/36
// reloading - may solve https://github.com/zoneminder/zmninja/issues/36
// if you are in the same mid event page $state.go won't work

$scope.id = monitorId;
Expand Down
2 changes: 1 addition & 1 deletion www/js/InvalidApiCtrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ angular.module('zmApp.controllers').controller('zmApp.InvalidApiCtrl', ['$scope'
};

$scope.readFAQ = function () {
window.open('https://github.com/pliablepixels/zmNinja/wiki/Validating-if-APIs-work-on-ZM', '_blank', 'location=yes');
window.open('https://github.com/zoneminder/zmninja/wiki/Validating-if-APIs-work-on-ZM', '_blank', 'location=yes');
return false;
};

Expand Down
2 changes: 1 addition & 1 deletion www/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ angular.module('zmApp', [
loginScreenString2: "var currentView = 'console'",
desktopUrl: "/zm",
desktopApiUrl: "/api/zm",
latestRelease: "https://api.github.com/repos/pliablepixels/zmNinja/releases/latest",
latestRelease: "https://api.github.com/repos/zoneminder/zmninja/releases/latest",
blogUrl: "https://medium.com/zmninja/latest?format=json",
nphSwitchTimer: 3000,
eventHistoryTimer: 5000,
Expand Down

0 comments on commit b2afa15

Please sign in to comment.