Commit Graph

1974 Commits

Author SHA1 Message Date
Pliable Pixels 980684a2f0 adjusted h1 size 2018-03-25 16:09:31 -04:00
Pliable Pixels cc2f285408 log view tweaks, cleaned up header issues 2018-03-25 16:01:04 -04:00
Pliable Pixels 1179b6ddc4 rounded top for tables and highlights 2018-03-25 11:43:34 -04:00
Pliable Pixels bf57b65ebb reduced 2nd row of navbar text 2018-03-25 09:56:41 -04:00
Pliable Pixels 809e58fae6 acct icon to material 2018-03-25 09:44:30 -04:00
Pliable Pixels 14f638e009 replaced ionic fonts with material design icons 2018-03-25 09:28:00 -04:00
Pliable Pixels acdc076b84 padding to navbutton 2018-03-24 18:36:10 -04:00
Pliable Pixels 10aedb51a6 reduced size of totals 2nd row 2018-03-24 18:30:50 -04:00
Pliable Pixels a68cc79437 using MIT licensed ion-icons, its smaller than FA, replaced some text with icons 2018-03-24 18:25:39 -04:00
Pliable Pixels 0b31cc4d3d 2nd level header tweak 2018-03-24 17:34:46 -04:00
Pliable Pixels b8f6c2277f clone icons 2018-03-24 10:21:59 -04:00
Pliable Pixels 140217bef6 icons, muted colors, text tightening 2018-03-24 09:59:39 -04:00
Isaac Connor 0bb1c5ce71 load groups when duping a monitor 2018-03-23 13:35:45 -07:00
Isaac Connor 85c757d2b1 Include group in parents list display 2018-03-23 13:35:02 -07:00
Isaac Connor 7d4652e37b make group and function popups bigger 2018-03-21 11:33:10 -07:00
Isaac Connor b4c13d56d6 Merge ../ZoneMinder.master into storageareas 2018-03-06 12:29:59 -05:00
Steve Gilvarry 1c740de5dc
Add Return False to Event Back 2018-03-04 13:37:30 +11:00
Steve Gilvarry db8ab28845
Add return false to window.history.back
Adding this makes it work in Safari
2018-03-04 08:37:21 +11:00
Isaac Connor c53b6ffbb0 rework montagereview to load data faster and leave event and frame data in json objects 2018-03-02 18:26:50 -08:00
Andrew Bauer 3e77a85549
url to css/spinner.css should be relative
fixes http 404 not found errors for this css file
2018-03-02 17:19:10 -06:00
Isaac Connor 7e628bc3fd add showing groups under Monitor Name on console 2018-03-01 19:23:46 -08:00
Isaac Connor c5eec7e2fd hide save button on successful form completion so we don't get a duplicate submit 2018-02-27 15:10:45 -08:00
Isaac Connor 83fad681b3 use button tags and hide the button content after click 2018-02-27 11:49:13 -08:00
Isaac Connor c50627fd88 GroupIds needs to be an array 2018-02-27 11:21:04 -08:00
Isaac Connor 6a6eb87686 fix defaults 2018-02-26 18:00:02 -08:00
Isaac Connor 793e87c26d Apply chosen style to group and linked monitors dropdown 2018-02-26 17:58:20 -08:00
Isaac Connor 92c34f6043 add Groups to monitor edit 2018-02-26 16:09:36 -08:00
Isaac Connor 9d1a8b1e18 Add the danger css tag to cpuload > 5, freeram < 10% and freeswap < 10% 2018-02-26 10:39:45 -08:00
Isaac Connor 7d88e25ef9 simplify thumbnail/snapshot usage a bit 2018-02-19 17:25:49 -05:00
Isaac Connor eeb7190812 fix rand replacing in image url 2018-02-14 13:16:30 -05:00
Isaac Connor 4c1abf93ba fixup navbarreloader wrt auth_hash 2018-02-14 13:16:14 -05:00
Isaac Connor 45bf4544ca rename SetImageSource to getImageSource which is what it actually does 2018-02-14 11:58:47 -05:00
Isaac Connor 4df8cdc685 add auth_hash updating to the navbar reload. 2018-02-14 10:44:48 -05:00
Isaac Connor c7a43a53f0 Sort the event records 2018-02-13 11:28:06 -05:00
Isaac Connor 535cdf6485 When there isn't an event for the given moment, play the previous one. If still no events found, popup live 2018-02-13 11:27:55 -05:00
Isaac Connor ad1b9699f1 Remove CssFileExtra 2018-02-11 14:18:40 -05:00
Isaac Connor 7abe7d6fe3 fix centering in buttons 2018-02-11 14:18:26 -05:00
Isaac Connor a35ba812b7 fix merging conditions 2018-02-09 07:57:52 -08:00
Isaac Connor 08c359fdbc add some margin to minTime and maxtime 2018-02-09 07:31:30 -08:00
Isaac Connor 63a214869e rework montagereview to be more performant. 2018-02-09 07:31:19 -08:00
Isaac Connor 6518311022 Use Status and CaptureFPS and AnalysisFPS to do status coloration 2018-02-09 07:31:03 -08:00
Isaac Connor 4b51fed500 Rework order of filters. Put Monitors at the end. recalc selected_monitor_ids 2018-02-09 07:30:53 -08:00
Isaac Connor 6ee133bf6b give some left margin on labels 2018-02-09 07:30:43 -08:00
Isaac Connor c454d5355d adjust column width on console 2018-02-09 07:30:32 -08:00
Isaac Connor cb9eef8563 show No streams found if none were found 2018-02-09 07:30:12 -08:00
Isaac Connor 6e240f669c fix filtering 2018-02-08 14:25:58 -08:00
Isaac Connor 894467cdef Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-02-08 10:51:49 -08:00
Isaac Connor b8b2edf847 close the datetime inputs 2018-02-08 10:50:33 -08:00
Isaac Connor 2a00cf852a Set a type on the buttons so that they act right 2018-02-08 10:50:22 -08:00
Isaac Connor 1ed8af8aac upgrade jquery-ui to 1.12.1 2018-02-08 13:19:16 -05:00
Isaac Connor 4777808cf0 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-02-08 13:15:41 -05:00
Isaac Connor 95cfdb327d further separate addBtn and cloneBtn, fixes 2018-02-08 13:15:27 -05:00
Isaac Connor cdfc7f1808 give the buttons div an id and move the styling into the css 2018-02-08 09:30:48 -08:00
Isaac Connor 4240dc4bde spacing, add a test for minTime being after maxTime 2018-02-08 09:30:26 -08:00
Isaac Connor d857c2c98a increase download popup height 2018-02-08 09:29:54 -08:00
Isaac Connor c47c81b810 title is translated, so we can't use it to determine which page we are on, so use view 2018-02-08 09:29:42 -08:00
Isaac Connor 16604e3ee4 fix including jquery in export 2018-02-08 09:29:12 -08:00
Isaac Connor f987bde6df fix styles on montagereview. Mostly remove borders and make timelineDiv 100% 2018-02-08 09:28:52 -08:00
Isaac Connor cfe53c0ffe Explicitly set the danger class on each line because they can get out of sync when using the All toggle 2018-02-08 09:57:11 -05:00
Isaac Connor babae4629a Update and fix console buttons. Use a separate button for clone 2018-02-08 09:47:16 -05:00
Isaac Connor f6bb3017ef Use absolute patch to point-g.png. Makes the assumption that /zm always works. 2018-02-08 07:49:52 -05:00
Isaac Connor a4c59e3e50 Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas 2018-02-07 09:07:57 -05:00
Isaac Connor dec82ecf5c Fix for when specifying page 1 and no pages 2018-02-07 09:07:51 -05:00
Isaac Connor e25af4b40c cleanup, reset result 2018-02-02 16:07:13 -05:00
Isaac Connor 058b2be9a7 fix chosen sprites 2018-02-02 13:26:44 -05:00
Isaac Connor 515af57c56 Fix some styles on filter edit 2018-02-02 13:24:01 -05:00
Isaac Connor dee843d7da add All and remove default from Storage dropdown options 2018-02-02 12:48:49 -05:00
Isaac Connor 060e6893cc fix Storage dropdown population and don't clear value on line type change 2018-02-02 12:48:22 -05:00
Isaac Connor e8ace6d4dd include base version of jquery-ui-theme 2018-02-02 12:47:51 -05:00
Isaac Connor 26ac1fd695 Include soap version in list of onvif cameras 2018-02-01 11:32:13 -05:00
Isaac Connor 132fff1931 An ok json return with no status is possible now 2018-01-31 14:35:48 -05:00
Isaac Connor 7c3efc02cd put back old add monitor popup 2018-01-31 11:56:57 -05:00
Isaac Connor b1f2b677c3 remove path from source 2018-01-30 10:09:12 -05:00
Isaac Connor b9a98d34bf strip query and scheme from source 2018-01-29 19:03:16 -05:00
Isaac Connor a60da6811b revert adding custom port for status updates. It breaks in the non-multiserver case. 2018-01-29 15:17:22 -05:00
Isaac Connor 6acb555c52 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-01-29 10:42:23 -08:00
Isaac Connor d19b8bc5cf add default value for ServerId in new Storage Object 2018-01-29 10:41:59 -08:00
Isaac Connor 06673019f9 add default values for zmstats, zmaudit, zmtrigger in new Server 2018-01-29 10:41:43 -08:00
Isaac Connor 8979f14314 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-01-29 11:29:33 -05:00
Isaac Connor a76fcb331c Remove debugging. Treat can't get semaphore as a non-error 2018-01-29 08:25:46 -08:00
Isaac Connor 4751920423 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-29 07:49:38 -08:00
Isaac Connor 35cda5cf17 Merge sjc04p1fviap02:ZoneMinder into storageareas 2018-01-29 07:45:55 -08:00
Isaac Connor a490c0e5bf Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-01-29 07:45:37 -08:00
Isaac Connor a782ef1db7 Add debug tests for loading all events 2018-01-29 07:45:28 -08:00
Isaac Connor e672841a8d Add remote server port to monitor url 2018-01-29 07:42:43 -08:00
Isaac Connor 03122b9015 add onFailure logger, and change link to chain so that responses don't just disappear 2018-01-29 07:38:02 -08:00
Isaac Connor dc6842bfbd Add remote server port to monitor url 2018-01-29 07:32:40 -08:00
Isaac Connor b793e6659b add onFailure logger, and change link to chain so that responses don't just disappear 2018-01-29 07:32:02 -08:00
Isaac Connor 984d3a2dd1 add Monitor Name to the response listing the available camera feeds 2018-01-29 07:30:46 -08:00
Isaac Connor 0b2d752ea4 Use chosen on the MonitorIds select. 2018-01-29 10:29:59 -05:00
Isaac Connor 2dcb0d183f Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-28 18:07:33 -08:00
Isaac Connor 8a4b17fb50 turn into a url instead of boolean. Use it to refresh the options page on change so that changes are instantly noticable 2018-01-28 15:13:57 -05:00
Isaac Connor 5d4fde88d9 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-27 12:17:13 -08:00
Isaac Connor 456f29fcba Rename column Id OF Monitor_Statuses to simplify JOINS. 2018-01-26 13:39:37 -05:00
Isaac Connor dc46f23af0 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-26 10:17:54 -08:00
Isaac Connor d001ce467e use get for status JSON requests 2018-01-26 10:31:55 -05:00
Isaac Connor 1e3cf9bbf8 handle no streams better 2018-01-25 09:14:21 -08:00
Isaac Connor 703cd332df Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-25 08:43:53 -08:00
Isaac Connor 356015a492 Merge branch 'tesla' of https://stash.teslamotors.com/scm/~iconnor/zoneminder into tesla 2018-01-25 08:42:08 -08:00
Isaac Connor 42a27c2ca9 Fix Servers dropdown 2018-01-25 08:41:54 -08:00