a63c0a26b8
content update
2015-08-17 16:21:24 -04:00
2ca3ca8d50
added missing zone images
2015-08-17 15:42:49 -04:00
c6e2914228
Added system diagram
2015-08-17 15:30:00 -04:00
3b3ae0adf5
This will be used from now on when generating master snapshots for ubuntu1504 for a single zoneminder.deb
...
It was taken from the debian official package on August 17th 2015. Various unneeded patches were removed
and the dependencies were change to use the ffmpeg version of av libraries. Also, since ubuntu1504 does not have cakephp 2 available
we cannot use a packaged version of that, so we still need our own copy for the api
2015-08-17 14:03:27 -04:00
75bdc0d2e1
Delete connect
...
deleted rouge file.
2015-08-17 12:33:16 -05:00
3462b0e0ab
content for server edit popup
2015-08-17 12:42:20 -04:00
1d8a4ebdd8
Merge branch 'master' into multi-server
2015-08-17 12:33:43 -04:00
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
7eb07dbb65
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-08-17 12:30:54 -04:00
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
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
e390200824
Small dark CSS fixes in frames and timeline view
2015-08-17 14:39:41 +02:00
299c629a20
Merge remote-tracking branch 'upstream/master' into large-timestamp
...
Conflicts:
CMakeLists.txt
configure.ac
version
2015-08-17 13:42:36 +02:00
0547a66870
Bump version to 1.28.102
2015-08-17 13:40:30 +02:00
ae9c38cfe8
bump version to 1.28.102
2015-08-16 17:57:31 -05:00
c17de4a00f
add Exif checkbox to monitor
2015-08-16 17:56:03 -05:00
3489d0d734
add Exif column to sql database
2015-08-16 17:43:45 -05:00
59c1b83d4f
create embed_exif flag in Monitor class
2015-08-16 17:42:12 -05:00
a8248c3f32
Merge pull request #1018 from knnniggett/new_group_permission
...
New User Permission "Groups"
2015-08-16 16:39:39 -04:00
e6061d53b3
Clarified mysql sleep is only needed for ubuntu 14.x and below
2015-08-16 15:13:28 -04:00
2232b6b68b
Updated API to add security notes
2015-08-16 15:05:15 -04:00
1c82f57ba3
Made content same as github README.md contributing
2015-08-16 14:49:44 -04:00
32f6c92b02
replace php short open tag
2015-08-16 12:29:03 -05:00
762e3eddc9
Updated mobile with correct info
2015-08-16 13:26:05 -04:00
8e491475d1
typos and whitespace fixes
2015-08-16 12:45:45 -04:00
4f07279d25
include server.php in autotools build
2015-08-16 12:25:23 -04:00
7d8bdd73f9
add api dir to autotools build
2015-08-16 12:23:32 -04:00
99d674ef78
remove code that put a * next to the server name. It was copied from the user list and indicated the logged in user.
2015-08-16 12:22:31 -04:00
b3240bbc8f
set name=action on submit tag, and remove stuff that we don't want right now
2015-08-16 12:21:52 -04:00
c0517b11ae
Merge branch 'master' into multi-server
2015-08-16 10:52:51 -04:00
9117e2949a
add server.php.
2015-08-16 10:52:47 -04:00
71e19f48e8
Content update
2015-08-16 05:34:00 -04:00
5b2155f551
define Groups permission for the default user
2015-08-15 16:47:07 -05:00
461f81089b
change table name from monitors to users
2015-08-15 15:42:00 -05:00
199795a67d
new content
2015-08-15 16:05:02 -04:00
36c7d7f9c2
Add Group Edit permission to the default admin account
2015-08-15 14:58:41 -05:00
0dc35553ef
modify group delete action
2015-08-15 14:03:11 -05:00
c53bb7f56f
change edit permission from system to groups
2015-08-15 13:45:43 -05:00
1d688be1a1
propagate canEditGroup permission
2015-08-15 13:22:13 -05:00
c051f3482b
add Groups to options again
2015-08-15 12:37:25 -05:00
1d97e9d1f9
Add Groups column to options
2015-08-15 12:24:48 -05:00
c828a3df33
typo
2015-08-15 12:13:35 -05:00
85e2b165b1
bump version to 1.28.101
2015-08-15 12:01:57 -05:00
936aa00a5e
add sql bits
2015-08-15 12:00:48 -05:00
2770e752b4
create new permission group "Groups" in php
2015-08-15 11:56:51 -05:00
53d3050e78
content updates
2015-08-15 11:57:03 -04:00
f77d0eda22
content updates
2015-08-15 11:56:08 -04:00
58f86c03fa
For future use
2015-08-14 20:28:31 -04:00
71b82ac84a
ZM Developer notes for review in red
2015-08-14 20:28:03 -04:00
1ccc127d72
Template for a custom style for future use
2015-08-14 20:27:44 -04:00
Pliable Pixels
Isaac Connor
Andrew Bauer
Robin Daermann
Andrew Bauer
Isaac Connor