mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-01-26 23:20:40 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,122 Commits 66 Branches 101 Tags
2fc7b3cf4d69e25fa68d190dd6b052d7fef94077
Commit Graph

5291 Commits

Author SHA1 Message Date
Isaac Connor
2fc7b3cf4d Don't allow deleting of in-progress recording 2019-05-24 09:31:48 -04:00
Isaac Connor
96f578f1bd If running a custom run state, show the state instead of Running. Also select the running state in the state change popup. (#2604) 2019-05-16 15:37:37 -04:00
Isaac Connor
1855ee441a Fix #2609 invalid value horz instead of hori in orientations enumeration 2019-05-15 19:35:19 -04:00
Jonathan Meredith
74d9f4f1aa Spelling and grammar fixes in help (#2603) 
* Edit Help array to make it match others below. This should not affect the results

* Misc. grammer and spelling fixes along with removing some duplicated words.  This should not affect compilation.

* More grammer and spelling errors

* Replace Javascript with ZoneMinder because it did not make sense there.

* More spelling and grammar edits
 2019-05-13 07:58:18 -04:00
Isaac Connor
940338ea12 namespace escape Error calls 2019-04-29 12:51:02 -04:00
Isaac Connor
a0dbb70af6 filter the form submit on enter to only affect input elements, not textareas 2019-04-26 10:40:11 -04:00
Isaac Connor
735a996e41 dsiable form submit on enter on the monitor view 2019-04-26 10:26:16 -04:00
Isaac Connor
6a250d61e3 cache_bust logger.js and overlay.js 2019-04-26 10:25:32 -04:00
Steve Root
0d4651c2d6 Update url to donate page (#2586) 2019-04-23 10:58:28 -04:00
Javier González Calleja
8195c4e395 Fixing video export view (#2585) 2019-04-20 11:19:27 -04:00
andornaut
164a2d4d70 Fix image path (#2576) 
Change the path of the "center.png" image from skins/classic/graphics/graphics/center.png to skins/classic/graphics/center.png.

Note that the `graphics/` directory was previously duplicated.
 2019-04-14 15:41:58 -04:00
Andrew Bauer
733bd66773 Merge pull request #2562 from santos995/master 
Added and edited tranlations to ru_ru.php
 2019-04-13 08:25:09 -04:00
Isaac Connor
df348c3513 lets go with reporting actual errors 2019-04-10 11:48:17 -04:00
Isaac Connor
f7dfe2982b Fix deleting single events 2019-04-10 11:46:12 -04:00
Pliable Pixels
d270fbd0ad added support for named params to consoleEvents (#2571) 2019-04-09 16:28:46 -04:00
Isaac Connor
37b7c32465 fix errors when no filter specified 2019-04-09 09:45:28 -04:00
Isaac Connor
5ad9219609 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2019-04-09 09:39:39 -04:00
Andrew Bauer
50dd63c21d fix eslint 2019-04-08 19:58:18 -05:00
Andrew Bauer
8af96e3c00 fix eslint errors 2019-04-08 18:40:52 -05:00
Isaac Connor
3abf263e7a fixup half-merged changes to filter to view in montagereview 2019-04-08 16:57:41 -04:00
Isaac Connor
780f4f9b9a Merge branch 'master' of github.com:zoneminder/ZoneMinder 2019-04-06 09:27:44 -04:00
Isaac Connor
381f526d66 spacing 2019-04-05 15:18:20 -04:00
Isaac Connor
79de2b65cd If we are saving jpegs we don't save a snapshot image, and since we may delay writing frame info to the db, we have to default to frame 0 instead of snapshot 2019-04-04 12:18:46 -04:00
Isaac Connor
8f3d1f8653 fix a missing = and use csrf_get_tokens instead of csrf_get_secret which is the wrong function 2019-04-02 15:25:14 -04:00
Isaac Connor
9e96c29620 Log a failed csrf check 2019-04-02 15:24:47 -04:00
Isaac Connor
8a90176a2c Add CanReboot to Controls 2019-04-02 09:25:50 -04:00
Isaac Connor
110e5075f4 fix namespace fixes #3566 2019-04-01 17:21:01 -04:00
Isaac Connor
15fb546e15 spacing 2019-04-01 11:13:35 -04:00
Isaac Connor
7d07cdf530 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2019-04-01 10:12:09 -04:00
Isaac Connor
fa9803d819 Can't use this->data to avoid another db hit. Must load by id 2019-04-01 10:11:56 -04:00
Andrew Bauer
e97751558f eslint fix 2019-03-30 10:41:04 -05:00
Isaac Connor
90e97ff135 Merge branch 'master' into storageareas 2019-03-28 11:20:29 -04:00
Isaac Connor
49e3f0a68e eslint fixes 2019-03-28 09:43:31 -04:00
Isaac Connor
ee4b452e42 Update monitor edit to not use inline js 2019-03-25 16:25:09 -04:00
Isaac Connor
c7e09e03d3 add cache busting to base.js 2019-03-25 16:24:46 -04:00
Isaac Connor
052a2ef1fd fix eventserver => eventnotification 2019-03-25 12:20:21 -04:00
Isaac Connor
7565e171b4 spacing 2019-03-25 12:18:15 -04:00
Isaac Connor
4eafc52955 spacing 2019-03-25 12:18:01 -04:00
Isaac Connor
7e62ccca3c Handle div by zero when TotalMem is not known for Server 2019-03-25 12:08:56 -04:00
Isaac Connor
8d07a4a08f Log useful error messages when can't mkdir the monitor events dir or the symlink to it. symlink is a warning because the symlink is just a user aid 2019-03-25 11:58:04 -04:00
santos995
accf826ae9 New translations 2019-03-25 11:44:01 +03:00
santos995
42196ed5aa Update translation ru 2 2019-03-25 10:20:27 +03:00
Isaac Connor
677b9cfbed Make controlcap popup wider 2019-03-24 09:59:04 -04:00
Isaac Connor
bd5c9b5b20 add Control to ZM namespace 2019-03-24 09:58:50 -04:00
santos995
01056fc0f4 Перевод некоторых слов 2019-03-24 04:14:06 +03:00
Isaac Connor
f311fcc9e0 change to a button 2019-03-22 17:28:23 -04:00
Isaac Connor
8f28ba0be3 beter debug and less often when no terms in parseFilter 2019-03-22 17:28:12 -04:00
Isaac Connor
6d4d353209 fix namespace on MontageLayout 2019-03-22 17:27:58 -04:00
Isaac Connor
16467595d4 Fix clicking in montage 2019-03-21 17:00:51 -04:00
Isaac Connor
65fab1b032 add px to width and height of event img 2019-03-21 14:14:45 -04:00