github.com/ZoneMinder/zmNinja commits | Ecosyste.ms: OpenCollective

Merge pull request #497 from florie1706/patch-1

Update locale-de.json

457dd610331618cd59709ac6a04c3a7f48f68c00 authored almost 8 years ago by Pliable Pixels <[email protected]>

Update locale-de.json

89b222328b074575a2f7eeaf9382a6adc349e52c authored almost 8 years ago by florie1706 <[email protected]>

Merge branch 'master' of github.com:pliablepixels/zmNinja

71b31f5e6d4a67e2af993a1dc2e0ca77154a83e2 authored almost 8 years ago by Pliable Pixels <[email protected]>

typo

de32d1391236928df583ad7d4e65acdc7bf9d45b authored almost 8 years ago by Pliable Pixels <[email protected]>

#459 - forgot to return after resolve, was falling through into auth

2503874f3da1bf922e6f693740d8193b4ad002a7 authored almost 8 years ago by Pliable Pixels <[email protected]>

Merge pull request #495 from cryptage21/patch-4

Update locale-fr 1.2.39

a3b4283f1482390f7c52f2ec477fbe2d7e537673 authored almost 8 years ago by Pliable Pixels <[email protected]>

fixed version file update

34017ca3792a966d8afe698f9d5ae9379c2bbe1f authored almost 8 years ago by Pliable Pixels <[email protected]>

nits

3ad789f91aeea5b3d95faf923c60d0b52bc1df41 authored almost 8 years ago by Pliable Pixels <[email protected]>

Update locale-fr 1.2.39

23fe6a4b042062db07f684794e572f677ba214a4 authored almost 8 years ago by cryptage21 <[email protected]>

Merge pull request #494 from florie1706/patch-2

Buttons in this view were the wrong way around

904528a14a8482f9c12f17c4f945daa341a5e671 authored almost 8 years ago by Pliable Pixels <[email protected]>

Merge pull request #493 from florie1706/patch-1

Change languages to their mother tongue

78b01be6baca305a773bc314c04787871dc8acb5 authored almost 8 years ago by Pliable Pixels <[email protected]>

Buttons in this view were the wrong way around

8d0301d41a213e8ad90742a0fc76d5142c25cbfa authored almost 8 years ago by florie1706 <[email protected]>

Change languages to their mother tongue

b50ec7b05e3953bc5d848401dc8ffbcece40a361 authored almost 8 years ago by florie1706 <[email protected]>

#491 - WTF?!?! Cordova version code generation changed?

b4872b1bbcb7b4d53fde81218929851104f405b3 authored almost 8 years ago by Pliable Pixels <[email protected]>

1.2.39

95c3139d3246db58a9700fc79872c8ac746fc21d authored almost 8 years ago by Pliable Pixels <[email protected]>

sorted language files

6e24f2b942bf91d982870130cf621bc5745bf894 authored almost 8 years ago by Pliable Pixels <[email protected]>

Merge pull request #490 from florie1706/master

#487 - devoption added to increase HTTP timeouts

182ce2a953de0460418e66cd4c9865b45848184c authored almost 8 years ago by Pliable Pixels <[email protected]>

Merge branch 'master' of github.com:pliablepixels/zmNinja

44ae012e2cdc8d673bc47e71a55cb3f8e4a6e235 authored almost 8 years ago by Pliable Pixels <[email protected]>

#491 - build process and config updated

e9af25f32d72a2146796c9eea3224c1d9c882ce9 authored almost 8 years ago by Pliable Pixels <[email protected]>

devoption added to increase HTTP timeouts

e9e3ef41134387369111df9a81f1375116b000d4 authored almost 8 years ago by florie1706 <[email protected]>

Merge pull request #489 from cryptage21/patch-3

#487 - devoption added to increase HTTP timeouts

3ea0fb36a8c0da5f076fb380affef8d59301bd2a authored almost 8 years ago by Pliable Pixels <[email protected]>

#487 - devoption added to increase HTTP timeouts

Mise à jour du fichier de langue.

47b4fd819886abbc9f4bbaf44397043fd858c0dd authored almost 8 years ago by cryptage21 <[email protected]>

Merge pull request #488 from maymaymay/patch-11

#487 - devoption added to increase HTTP timeouts

6baa6700362f405ff2e5a855d24759adc3a704e6 authored almost 8 years ago by Pliable Pixels <[email protected]>

#487 - devoption added to increase HTTP timeouts

62c03077df54d7159f0c972d14b94d596474e78c authored almost 8 years ago by maymaymay <[email protected]>

#487 - devoption added to increase HTTP timeouts

d38b5719bad24d1039feb8d0e2b5f29c17158486 authored almost 8 years ago by Pliable Pixels <[email protected]>

Merge pull request #486 from florie1706/master

Fixes for some bad German translations

9b40d4c38e0ef1f223de052780af05642890e4aa authored almost 8 years ago by Pliable Pixels <[email protected]>

Update locale-de.json

cd63382c1a075e4fe8a3c97407027606e868d128 authored almost 8 years ago by florie1706 <[email protected]>

Merge pull request #485 from florie1706/master

zmNinja removed from translation

eba1c4c2942571371838e4753b2819db42a1f294 authored almost 8 years ago by Pliable Pixels <[email protected]>

Update locale-de.json

51b28f73049de1d7dd0469779c777adce12f38df authored almost 8 years ago by florie1706 <[email protected]>

Merge pull request #480 from maymaymay/patch-10

clarified menu option

36a330889c455a3b80cc4a3c3086244ae2b8d275 authored almost 8 years ago by Pliable Pixels <[email protected]>

Merge pull request #481 from florie1706/patch-1

clarified menu option

1df5757fe80d91a67faa0fd78759752c469bf9c0 authored almost 8 years ago by Pliable Pixels <[email protected]>

clarified menu option

25e35aaa7111615f91d5cd93e2cbf7293f4aa985 authored almost 8 years ago by florie1706 <[email protected]>

clarified menu option

964ebafa385fd980de6b7d78978bc8281bf81f0a authored almost 8 years ago by maymaymay <[email protected]>

Merge pull request #479 from cryptage21/patch-2

French Language - Update 1

7b9de989188c980e5886c70ef121fbcbe5b507e8 authored almost 8 years ago by Pliable Pixels <[email protected]>

Update V2 to match the GUI

3f81bf1c6e749de05f8fc32794d40a4418dd2f1e authored almost 8 years ago by cryptage21 <[email protected]>

config changes to get websockets working in iOS - but looks like a cert was needed to be installed.

6cc411e30d104e8f0aac19b60886d8747d856ffe authored almost 8 years ago by Pliable Pixels <[email protected]>

clarified menu option

7cf60bf77c84c4721d439837f5af7baf67ab87d3 authored almost 8 years ago by Pliable Pixels <[email protected]>

#473 - changed hotkey to Cmd/Ctrl+Alt+F and now it toggles

30076df5e3c7f33d9f105625bbc3b98ddadacc2c authored almost 8 years ago by Pliable Pixels <[email protected]>

Merge pull request #478 from florie1706/master

Update locale-de.json

2cac3f6cfc2466d64b75f50e6a61e0e25298a3e3 authored almost 8 years ago by Pliable Pixels <[email protected]>

Update locale-de.json

e5fe6610918a5b9f0f2585ed888e2e7f470ec84c authored almost 8 years ago by florie1706 <[email protected]>

Merge pull request #474 from florie1706/patch-6

more fixes

b99c23ea2023d5bf02cf814e993e06609067d78e authored almost 8 years ago by Pliable Pixels <[email protected]>

more fixes

5e560f3471d28bd1a9c46ce08d4a1bb1d671a3b8 authored almost 8 years ago by florie1706 <[email protected]>

Merge pull request #472 from florie1706/patch-5

Fixed some translations for a better understanding

e9d331459c34295c4820badb17765e2d493b0512 authored almost 8 years ago by Pliable Pixels <[email protected]>

Fixed some translations for a better understanding

a49fd596200de7376b09185bebd8fb056182ae89 authored almost 8 years ago by florie1706 <[email protected]>

Merge pull request #470 from florie1706/patch-2

fixed some typos

6d8ae6639650479dfc5e26a09487956c3f282135 authored almost 8 years ago by Pliable Pixels <[email protected]>

Merge branch 'master' into patch-2

b2537aa1e9f72862e41f7d2ce8993de41cc2886a authored almost 8 years ago by Pliable Pixels <[email protected]>

Merge pull request #471 from florie1706/patch-3

wrong wording

0f485f60c89711aef2d366f99d590768fba026bb authored almost 8 years ago by Pliable Pixels <[email protected]>

Update locale-de.json

7d83145385dc9077b42373364c177bad430d5ce1 authored almost 8 years ago by florie1706 <[email protected]>

fixed some typos

01eba0c41d7e6e78dc6e090cd343e71418b639e9 authored almost 8 years ago by florie1706 <[email protected]>

reorganized menu flow

744d57b04e8bb684275dbf32910ce018c49cc832 authored almost 8 years ago by Pliable Pixels <[email protected]>

#469 - french added

1deddb16254aa8c92aab5e7e4e7af73fd60ae25b authored almost 8 years ago by Pliable Pixels <[email protected]>

avoid bogus scale error

9f89d8ef959549ce61cdd835d23bcae2026bfcf7 authored almost 8 years ago by Pliable Pixels <[email protected]>

#465 - integrated german lan

c1fb2b9cd88e7d2fdeb66b7e558df766a4c7cf34 authored almost 8 years ago by Pliable Pixels <[email protected]>

Merge pull request #465 from florie1706/patch-1

Create locale-de.json

b78199e826bc89ba46e26691e052ea7e8da48f4e authored almost 8 years ago by Pliable Pixels <[email protected]>

Update locale-de.json

b814165ca07dae1bd6824d258523ee792e7ffb1f authored almost 8 years ago by florie1706 <[email protected]>

Update locale-de.json

0b1aadf83b22680e82443b2b69bffd0cc06b2cc9 authored almost 8 years ago by florie1706 <[email protected]>

Create locale-de.json

f83051d6be87f1ad78812deb38f723894819c1b5 authored almost 8 years ago by florie1706 <[email protected]>

Merge pull request #463 from fxrnando/384-spanish-trans

spanish update

566edcc53431e4cb021ca01375c0ba24d7bba22c authored almost 8 years ago by Pliable Pixels <[email protected]>

Merge pull request #461 from maymaymay/patch-9

android and iOS ports now allow for strict SSL checks...

09b0dad7874f0b813937631447cc138ee16d5552 authored almost 8 years ago by Pliable Pixels <[email protected]>

desktop window state should now be remembered #462

dbfa41acbdcb8ea1e58ac38455f61d6b2a91e008 authored almost 8 years ago by Pliable Pixels <[email protected]>

spanish update

b9162d51f2992b50aae69d970fab47955c33d6cb authored almost 8 years ago by Fxrnando <[email protected]>

android and iOS ports now allow for strict SSL checks...

7a1bc2f5e595e9d700e2fba473ce416d73389939 authored almost 8 years ago by maymaymay <[email protected]>

if auth is unchecked it won't do a bogus login #459 Hope this doesn't break other stuff

c50c77f5abc3b2977a3357ec21a9417ed97442fa authored almost 8 years ago by Pliable Pixels <[email protected]>

1.2.38

6b83a8c3e248e1333559247264ccf916ed4a8448 authored almost 8 years ago by Pliable Pixels <[email protected]>

reverted some changes done to config.xml post 1.2.36 that broke video playback for some

7d595aecc931df6209c0caf611232e5b84593380 authored almost 8 years ago by Pliable Pixels <[email protected]>

trying to track down video playback issues

26b287419deafb1287986b397a094b37fa8b8a18 authored almost 8 years ago by Pliable Pixels <[email protected]>

android and iOS ports now allow for strict SSL checks via setting in dev options. DO NOT ENABLE with self signed certs #455

4f24f51a5eb31c3c1e93ecbbc65111b0c037ff29 authored almost 8 years ago by Pliable Pixels <[email protected]>

Merge pull request #456 from maymaymay/patch-8

let's make GIF and MP4 an option in Dev Settings #454

9259570206df3033c40fdb1f753d53911f8e0358 authored almost 8 years ago by Pliable Pixels <[email protected]>

let's make GIF and MP4 an option in Dev Settings #454

917a52954e0813a692ff5f8acff25d453f19e0d3 authored almost 8 years ago by maymaymay <[email protected]>

let's make GIF and MP4 an option in Dev Settings #454

8cdb3fc1b13b0058fe59a78060133fac58c1e0a5 authored almost 8 years ago by Pliable Pixels <[email protected]>

the playback rate will now be remembered #453

cc5009c13e0c406f1601027d479c966069689914 authored almost 8 years ago by Pliable Pixels <[email protected]>

1.2.37

bbe2c2cf6fa0a93e04eb18a713cfc2593f6d0511 authored almost 8 years ago by Pliable Pixels <[email protected]>

various fixes for the odd "no connection" issue

85e4e5326e79c5f5304a25e31f129b69ed647a8d authored almost 8 years ago by Pliable Pixels <[email protected]>

server logs and other tweaks

9cf314cc8ca5f57148bfa8d503bc9698bfec9ac4 authored almost 8 years ago by Pliable Pixels <[email protected]>

error handler enhanced #451

fe2504f6311c25689888e7d5b398087d55df99d8 authored almost 8 years ago by Pliable Pixels <[email protected]>

handle non debug case of fs arg #450

937117cdcdf12ab3d339da004013bfd5e3327aee authored almost 8 years ago by Pliable Pixels <[email protected]>

Merge pull request #446 from maymaymay/patch-7

Translations

be3633a02f62f47a718898d03bb1bbd13c2dbde2 authored almost 8 years ago by Pliable Pixels <[email protected]>

reflow without changing size #448

50d385c41ea66b2dabbc8568d0e063f6cb1bc58d authored almost 8 years ago by Pliable Pixels <[email protected]>

Translations

4ba630d3f0f3d3930365103afa21aaf97eca3832 authored almost 8 years ago by maymaymay <[email protected]>

1.2.36

e4d0eacbb481ab64960f2fe9f93cc537bd38b699 authored almost 8 years ago by Pliable Pixels <[email protected]>

minor release tweaks

1c4c12af513ae9208ce92d34e1557e143ed8f0ef authored almost 8 years ago by Pliable Pixels <[email protected]>

you can now hide the buttons #443

e2c87f9bb24181b1a9daffd7892c4666479b8a19 authored almost 8 years ago by Pliable Pixels <[email protected]>

Merge pull request #442 from steelyard-nl/440-Hard-coded-text-found-

440 hard coded text found

1d99824454e606ff2fd77c415325eb251cfd4196 authored almost 8 years ago by Pliable Pixels <[email protected]>

Merge pull request #439 from maymaymay/patch-5

sorted keys #437

b37db48ac507c6a84ee9a8c71b1ef2bc65621bd5 authored almost 8 years ago by Pliable Pixels <[email protected]>

Placeholders in templates #440

1f3a41ad2b2f66ce33de74fbb3cea3a29616f468 authored almost 8 years ago by steelyard-nl <[email protected]>

Removed hard coded PortalUrl placeholder example

5b7bd824f59ecf6b629f68548e75a94c65794834 authored almost 8 years ago by steelyard-nl <[email protected]>

Merge remote-tracking branch 'refs/remotes/origin/master' into 440-Hard-coded-text-found-

# Conflicts:
# www/templates/timeline.html

f09ddff0fa5d8b1eaadedee578c415a808afe9c5 authored almost 8 years ago by steelyard-nl <[email protected]>

Update time-line true / false translated

In timeline template the update timeline button true/false changed to
use translation.

75cd89cad9414f13e06ab2783867d39e5dc1f1ba authored almost 8 years ago by steelyard-nl <[email protected]>

Timeline hard coded true/false removed

In the Timeline template was the update true / false not translated.
Changed it to using transla...

9a74711e529ee3a44ee09456de81e29b780238fe authored almost 8 years ago by steelyard-nl <[email protected]>

Merge remote-tracking branch 'refs/remotes/pliablepixels/master'

4461600c8badadeeeffab1b231dd905dbbc272ed authored almost 8 years ago by steelyard-nl <[email protected]>

sorted keys #437

f9866fd1a8b1c8ab749885dd76e75b907c17b18c authored almost 8 years ago by maymaymay <[email protected]>

sorted keys #437

a4e140d204dc1d66a4c7a0579f4f56593c41d1b9 authored almost 8 years ago by Pliable Pixels <[email protected]>

Merge pull request #438 from steelyard-nl/437-Hard-coded-text-alert-found

437 hard coded text alert found

1ff32acb2e091e144c77557b7ca13933b410e30a authored almost 8 years ago by Pliable Pixels <[email protected]>

Merge pull request #2 from steelyard-nl/437-Hard-coded-text-alert-found

437-Hard-coded-text-alert-found

bb60efedecd970a702f193b339080e023ac656bf authored almost 8 years ago by steelyard-nl <[email protected]>

Merge remote-tracking branch 'refs/remotes/origin/master' into 437-Hard-coded-text-alert-found

e25d44d09fc028e87f7ca9694e1b0fc4c9b530a4 authored almost 8 years ago by steelyard-nl <[email protected]>

Merge remote-tracking branch 'refs/remotes/origin/437-Hard-coded-text-alert-found'

8834d8d292a80106587693801a565b6e65792b0e authored almost 8 years ago by steelyard-nl <[email protected]>

White space issue fixed

TAB used in Notepad++, changed to spaces.

3bb15225e2b405c2fc651da9bba08b33c3094264 authored almost 8 years ago by steelyard-nl <[email protected]>

Whitespace issues fixed

TAB used in Notepad++ and not SPACE.

184d06bc9ce1ecf4be970379dcabf74671b5b4eb authored almost 8 years ago by steelyard-nl <[email protected]>

Hard coded text found #437

44bf088c3b8b8ce6d135d808a397c6e0de431397 authored almost 8 years ago by steelyard-nl <[email protected]>

Merge remote-tracking branch 'refs/remotes/pliablepixels/master'

80a66592e858481daac0e696ebe10306517fb90e authored almost 8 years ago by steelyard-nl <[email protected]>