Isaac Connor
|
cc989dbe19
|
fix putting the mode back. I merged it to the wrong place
|
2014-11-19 13:54:10 -05:00 |
|
Isaac Connor
|
f8dd2c6eaf
|
Merge branch 'master' into controlversionfixes
|
2014-11-19 12:53:28 -05:00 |
|
Isaac Connor
|
793998484c
|
Merge branch 'master' into zmupdatefixes
Conflicts:
scripts/zmupdate.pl.in
|
2014-11-19 12:47:31 -05:00 |
|
Isaac Connor
|
790005c155
|
Include monitor name in log otput so we know which monitor we are talking about. This informaton is not included when the error occurs in zms.
|
2014-11-19 12:42:05 -05:00 |
Kyle Johnson
|
c8a3cb9df9
|
Initial refactor of console view to use api & angular
* Move eventCounts to the API and bind with angular
* Display the console as a grid, rather than a table
* Show only information we want to see
|
2014-11-19 15:53:07 +00:00 |
|
Kyle Johnson
|
a0f12575fe
|
Add API function to return event counts for console view
|
2014-11-19 15:49:38 +00:00 |
|
Isaac Connor
|
4f9a2e1689
|
update Depends to match ubuntu.
|
2014-11-17 09:17:03 -05:00 |
|
Kyle Johnson
|
5eaedae973
|
Tell git to ignore cmake generated files
|
2014-11-16 01:14:20 +00:00 |
|
Kyle Johnson
|
64122b3b98
|
Set the logState in header via angular
|
2014-11-16 00:35:10 +00:00 |
|
Kyle Johnson
|
175e7d3e22
|
Initial commit of Host MVC.
Used for daemonCheck, getLoad, etc
|
2014-11-16 00:21:55 +00:00 |
|
Kyle Johnson
|
f1a70076d0
|
Convert some of event view to angularjs
|
2014-11-15 23:51:31 +00:00 |
|
Kyle Johnson
|
5b4dfce34a
|
Add Event controller and factory
|
2014-11-15 23:50:46 +00:00 |
|
Kyle Johnson
|
519a5e1612
|
Setup html5mode to enabled
|
2014-11-15 23:50:04 +00:00 |
|
Kyle Johnson
|
47770bffe4
|
Add <base> element to <head> so I can use $location.search
|
2014-11-15 23:49:18 +00:00 |
|
Kyle Johnson
|
1fc26c01ac
|
Merge remote-tracking branch 'origin/master' into bootstrap-skin
|
2014-11-15 21:47:01 +00:00 |
|
Kyle Johnson
|
2db5d66134
|
Include state js and php in all pages.
As we can now start / stop the software from any page, via a modal,
we need the state's php and js files to do so.
|
2014-11-15 19:48:04 +00:00 |
Andrew Bauer
|
729d4dd9c4
|
Update README.md
|
2014-11-15 13:47:47 -06:00 |
|
Kyle Johnson
|
f38a9c9f06
|
Add jquery
|
2014-11-15 19:46:34 +00:00 |
|
Kyle Johnson
|
36ebaaff33
|
Add HeaderController to the header nav
|
2014-11-15 19:45:18 +00:00 |
|
Andrew Bauer
|
ef3f06bc62
|
Update README.md
|
2014-11-15 13:39:32 -06:00 |
|
Andrew Bauer
|
83026fba98
|
Update README.md
|
2014-11-15 13:38:51 -06:00 |
|
Kyle Johnson
|
58fbc6c833
|
Wrap pagination links in <li> instead of <p>
|
2014-11-15 19:38:45 +00:00 |
|
Kyle Johnson
|
4c0e2dc743
|
Include initial angularjs files
|
2014-11-15 19:34:00 +00:00 |
|
Andrew Bauer
|
a9de2416b8
|
Update README.md
|
2014-11-15 13:19:02 -06:00 |
|
Andrew Bauer
|
32ee3e8431
|
Merge pull request #577 from knnniggett/zmeditconfigdata
Add zmeditconfigdata.sh script to source
|
2014-11-15 13:15:45 -06:00 |
|
Kyle Johnson
|
d5181ff6d4
|
Merge branch 'api-updates'
|
2014-11-15 19:06:58 +00:00 |
|
Kyle Johnson
|
35530c627a
|
Initial commit of Logs MVC
|
2014-11-15 19:03:40 +00:00 |
|
Kyle Johnson
|
0129ca5f74
|
Rework the ConfigParser component.
|
2014-11-15 19:03:10 +00:00 |
|
Kyle Johnson
|
e7d726bf75
|
Don't print out the Config string to the file system.
|
2014-11-15 19:02:54 +00:00 |
|
Kyle Johnson
|
fcaa67e3c3
|
Slight refactor of ConfigParser Component. Needs more work.
|
2014-11-15 19:02:18 +00:00 |
|
Kyle Johnson
|
cf3d0f962c
|
Add view for Configs Edit
|
2014-11-15 19:02:03 +00:00 |
|
Kyle Johnson
|
9f80a7d5f5
|
Show a list of Config Key:Value pairs
|
2014-11-15 19:01:32 +00:00 |
|
Kyle Johnson
|
9268c503af
|
Do not display the "hidden" config category
|
2014-11-15 19:01:19 +00:00 |
|
Kyle Johnson
|
b9f54056da
|
Add component for dumping Config table as HTML
|
2014-11-15 18:59:58 +00:00 |
|
Kyle Johnson
|
de631075d3
|
Return possible source types ni DB via API
|
2014-11-15 18:59:24 +00:00 |
|
Kyle Johnson
|
0d57306790
|
Find category configs only when $category is not null. API
|
2014-11-15 18:58:58 +00:00 |
|
Kyle Johnson
|
9f150c4e46
|
Revert "Find category configs only when $category is not null. API"
This reverts commit efbbcadc7dad9aa52a7aab0483546eab48840ae6.
|
2014-11-15 18:58:51 +00:00 |
|
Kyle Johnson
|
b88febeaee
|
Find category configs only when $category is not null. API
|
2014-11-15 18:58:43 +00:00 |
Andrew Bauer
|
2dc73810db
|
Update rpm specfiles to make use of zmeditconfigdata.sh
|
2014-11-15 12:55:33 -06:00 |
|
Kyle Johnson
|
0a7ba112ab
|
API support for querying config categories.
Either return a list of distinct categories, or all configs under a
certain category
|
2014-11-15 18:55:20 +00:00 |
|
Andrew Bauer
|
790ecba0b2
|
Move script to /utils
|
2014-11-15 12:48:01 -06:00 |
|
Kyle Johnson
|
b04d970132
|
Add charset and other meta tags to head
|
2014-11-15 17:34:51 +00:00 |
|
Kyle Johnson
|
6911b99271
|
Move groups link to the console sidebar
|
2014-11-15 16:51:39 +00:00 |
|
Andrew Bauer
|
5a59a0375d
|
Add zmeditconfigdata.s script to source
|
2014-11-15 10:49:53 -06:00 |
|
Kyle Johnson
|
a6027ccdca
|
Make the ZoneMinder text a link to the console
|
2014-11-15 16:49:44 +00:00 |
|
Kyle Johnson
|
e359a1cf97
|
Move 'state' to header, as on/off btn, in a modal
|
2014-11-15 16:47:42 +00:00 |
|
Kyle Johnson
|
08d2cf801e
|
Move header outside of form in console
|
2014-11-15 16:34:45 +00:00 |
|
Andrew Bauer
|
f120546f9e
|
Merge pull request #573 from manupap1/rtsp_fix
Fix a bug when closing RTSP session over TCP
|
2014-11-14 09:57:19 -06:00 |
manupap1
|
f05699a005
|
Fix a bug when closing RTSP session over TCP
|
2014-11-14 11:17:27 +01:00 |
|
Andrew Bauer
|
3a9f814303
|
Merge pull request #572 from ZoneMinder/buffer_cleanup
remove the case for level >= 2. Since level is a bool, this code can ne...
|
2014-11-13 15:47:37 -06:00 |