ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,044 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

5044 Commits

Author SHA1 Message Date
Andrew Bauer 75bdc0d2e1 Delete connect 
deleted rouge file.
 2015-08-17 12:33:16 -05:00
Isaac Connor 3462b0e0ab content for server edit popup 2015-08-17 12:42:20 -04:00
Isaac Connor 6bd038cb29 don't add the api to autotools, because the autotools files are not present in there 2015-08-17 12:33:00 -04:00
Isaac Connor 7eb07dbb65 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-08-17 12:30:54 -04:00
Robin Daermann 55eee8d6a4 Added SQL changes to zm_create.sql.in 
Bumped version to 1.28.103 as requested
 2015-08-17 15:05:17 +02:00
Andrew Bauer 87bb60d829 Merge pull request #1019 from schrorg/dark-css-fixes 
Small dark CSS fixes in frames and timeline view
 2015-08-17 07:59:23 -05:00
Robin Daermann e390200824 Small dark CSS fixes in frames and timeline view 2015-08-17 14:39:41 +02:00
Robin Daermann 299c629a20 Merge remote-tracking branch 'upstream/master' into large-timestamp 
Conflicts:
	CMakeLists.txt
	configure.ac
	version
 2015-08-17 13:42:36 +02:00
Robin Daermann 0547a66870 Bump version to 1.28.102 2015-08-17 13:40:30 +02:00
Andrew Bauer ae9c38cfe8 bump version to 1.28.102 2015-08-16 17:57:31 -05:00
Andrew Bauer c17de4a00f add Exif checkbox to monitor 2015-08-16 17:56:03 -05:00
Andrew Bauer 3489d0d734 add Exif column to sql database 2015-08-16 17:43:45 -05:00
Andrew Bauer 59c1b83d4f create embed_exif flag in Monitor class 2015-08-16 17:42:12 -05:00
Isaac Connor a8248c3f32 Merge pull request #1018 from knnniggett/new_group_permission 
New User Permission "Groups"
 2015-08-16 16:39:39 -04:00
Pliable Pixels e6061d53b3 Clarified mysql sleep is only needed for ubuntu 14.x and below 2015-08-16 15:13:28 -04:00
Pliable Pixels 2232b6b68b Updated API to add security notes 2015-08-16 15:05:15 -04:00
Pliable Pixels 1c82f57ba3 Made content same as github README.md contributing 2015-08-16 14:49:44 -04:00
Andrew Bauer 32f6c92b02 replace php short open tag 2015-08-16 12:29:03 -05:00
Pliable Pixels 762e3eddc9 Updated mobile with correct info 2015-08-16 13:26:05 -04:00
Isaac Connor 8e491475d1 typos and whitespace fixes 2015-08-16 12:45:45 -04:00
Isaac Connor 4f07279d25 include server.php in autotools build 2015-08-16 12:25:23 -04:00
Isaac Connor 7d8bdd73f9 add api dir to autotools build 2015-08-16 12:23:32 -04:00
PliablePixels 71e19f48e8 Content update 2015-08-16 05:34:00 -04:00
Andrew Bauer 5b2155f551 define Groups permission for the default user 2015-08-15 16:47:07 -05:00
Andrew Bauer 461f81089b change table name from monitors to users 2015-08-15 15:42:00 -05:00
PliablePixels 199795a67d new content 2015-08-15 16:05:02 -04:00
Andrew Bauer 36c7d7f9c2 Add Group Edit permission to the default admin account 2015-08-15 14:58:41 -05:00
Andrew Bauer 0dc35553ef modify group delete action 2015-08-15 14:03:11 -05:00
Andrew Bauer c53bb7f56f change edit permission from system to groups 2015-08-15 13:45:43 -05:00
Andrew Bauer 1d688be1a1 propagate canEditGroup permission 2015-08-15 13:22:13 -05:00
Andrew Bauer c051f3482b add Groups to options again 2015-08-15 12:37:25 -05:00
Andrew Bauer 1d97e9d1f9 Add Groups column to options 2015-08-15 12:24:48 -05:00
Andrew Bauer c828a3df33 typo 2015-08-15 12:13:35 -05:00
Andrew Bauer 85e2b165b1 bump version to 1.28.101 2015-08-15 12:01:57 -05:00
Andrew Bauer 936aa00a5e add sql bits 2015-08-15 12:00:48 -05:00
Andrew Bauer 2770e752b4 create new permission group "Groups" in php 2015-08-15 11:56:51 -05:00
PliablePixels 53d3050e78 content updates 2015-08-15 11:57:03 -04:00
PliablePixels f77d0eda22 content updates 2015-08-15 11:56:08 -04:00
PliablePixels 58f86c03fa For future use 2015-08-14 20:28:31 -04:00
PliablePixels 71b82ac84a ZM Developer notes for review in red 2015-08-14 20:28:03 -04:00
PliablePixels 1ccc127d72 Template for a custom style for future use 2015-08-14 20:27:44 -04:00
PliablePixels 7e24cbebd1 Completed ubuntu package install instructions 2015-08-14 20:00:11 -04:00
PliablePixels cd6c2a5763 Updated screenshot 2015-08-14 19:59:47 -04:00
PliablePixels 2ea8d68fa7 content updated 2015-08-14 11:53:23 -04:00
PliablePixels 69c7e0f556 content updated 2015-08-14 11:19:16 -04:00
PliablePixels 38caa4df3c content updated 2015-08-14 10:28:28 -04:00
PliablePixels 10d8d4ea93 content updates 2015-08-14 09:29:09 -04:00
PliablePixels ce704bf596 content update 2015-08-14 09:20:59 -04:00
PliablePixels 35580cf787 Fixed heading hierarchy of API so they all don't show in master TOC 2015-08-14 08:56:28 -04:00
PliablePixels 2b09afdcd0 FAQ is now the same as Wiki FAQ with sphinx format conversion 2015-08-14 08:55:38 -04:00