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

1666 Commits

Author SHA1 Message Date
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 85e2b165b1 bump version to 1.28.101 2015-08-15 12:01:57 -05:00
Andrew Bauer 2770e752b4 create new permission group "Groups" in php 2015-08-15 11:56:51 -05:00
Andrew Bauer 66ec84fdea Merge pull request #1008 from pliablepixels/993-API-Auth 
Included logic to not enforce authentication in API layer if ZM auth is off
 2015-08-11 14:51:02 -05:00
Pliable Pixels a64f7c0036 Included logic to not enforce authentication in API layer if ZM_OPT_USE_AUTH is disabled 
If ZM auth is off, API won't work. Changed this to make sure API disables auth if ZM disables auth
 2015-08-11 14:47:49 -04:00
Andrew Bauer dff624a42c Merge pull request #985 from ZoneMinder/fix_state_load 
fix #948 1
 2015-08-11 10:45:16 -05:00
Andrew Bauer 882bf76750 Merge pull request #986 from ZoneMinder/fix_948_3 
quiet error when no Servers in Servers table
 2015-08-11 10:45:04 -05:00
Isaac Connor 495d7ad374 Merge pull request #1001 from Linwood-F/1000-add-scale-feature-to-image-php 
Add scale as optional feature to image.php
 2015-08-11 11:37:40 -04:00
Isaac Connor 3e5170678e Merge pull request #1006 from pliablepixels/993-API-Auth 
I was using the wrong field to check for portal authentication
 2015-08-10 15:58:50 -04:00
Pliable Pixels f7025aaa26 I was using the wrong field to check for portal authentication 
Should be user.Username instead of username
 2015-08-10 15:55:44 -04:00
Linwood-F c4599cdeda Fix bug report on 100% scale 2 2015-08-09 20:30:42 -04:00
Linwood-F 938a2e7de2 Fix bug report on 100% scale 2015-08-09 20:14:33 -04:00
Linwood-F 4fedb5fce0 Fix typo in last commit 2015-08-09 18:41:12 -04:00
Linwood-F 6da8da9d8d Add ability to do either height or width or both 2015-08-09 18:19:12 -04:00
Linwood-F 34c2902570 Add scale as optional feature to image.php 2015-08-09 12:02:13 -04:00
Pliable Pixels 2b0a975fef Bumped up # of events per API to 100 instead of 25 2015-08-07 16:25:48 -04:00
Pliable Pixels 38799050ef APIs will be served only if user is logged into the ZM portal 2015-08-07 16:14:02 -04:00
Robin Daermann 37e01b504b Implemented #989 (highlight current row in tables) for dark CSS 2015-08-05 14:36:07 +02:00
Dmitry Smirnov c4f78d634c CSS[skins/classic]: highlight current row in tables. 
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
 2015-08-05 10:43:02 +10:00
Isaac Connor 4c8d7d7f62 quiet error when no Servers in Servers table 2015-08-04 11:48:04 -04:00
Isaac Connor e178e1b1d6 fix #948 1 2015-08-04 11:37:11 -04:00
Robin Daermann 651cffd3b5 Small color corrections in tabList 2015-07-27 10:07:01 +02:00
Robin Daermann 14ebd937c7 Added missing javascript file to Makefile.am 2015-07-27 09:53:59 +02:00
Robin Daermann 5588406570 Add dark CSS for classic view 2015-07-27 09:53:59 +02:00
root 911f0fad28 Use destination color from CSS in transition effect in log view (instead 
of #000000)
 2015-07-27 09:53:59 +02:00
Pliable Pixels e332fc36a9 Fixed Configs API to return all values 2015-07-21 13:28:37 -04:00
Andrew Bauer 500b560884 Merge pull request #952 from schrorg/583-correct-de_de-encoding 
Change encoding of german language file to UTF-8
 2015-07-20 08:07:30 -05:00
Isaac Connor 02ee745167 parameter to defined should be in quotes 2015-07-17 10:09:22 -04:00
root a9df82256b Change encoding of web/lang/de_de.php from ISO-8859-1 to UTF-8 2015-07-17 14:24:46 +02:00
root 560a4cccbe Show correct part of URL (hostname) for ffmpeg sources in console 2015-07-17 13:59:40 +02:00
Isaac Connor ace8597b8d Merge branch 'master' into multi-server 2015-07-14 16:10:51 -04:00
Pliable Pixels 444d978c81 Added API routing 2015-07-13 18:55:28 +00:00
Isaac Connor 04366e752a add Servers to options, a server editing popup and a server selection to monitors 2015-07-09 11:41:46 -04:00
Isaac Connor 42ac3ceb3b Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-07-09 11:00:05 -04:00
Isaac Connor 51631b84b4 cleanup generated files 2015-07-09 10:59:45 -04:00
Andrew Bauer 8406818b00 Merge pull request #921 from pliablepixels/master 
Added "RewriteBase /zm/api" for API routing
 2015-07-05 08:34:28 -05:00
Pliable Pixels 3a9c941213 Added "RewriteBase /zm/api" for API routing 2015-07-05 08:59:07 -04:00
Andrew Bauer 1b2f214340 Dumb down Crud from 4.0 -> 3.0.10 2015-06-30 10:26:29 -05:00
Andy Bauer 1aebbec4e8 Merge branch '898-isRunning-States' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-898-isRunning-States 
Conflicts:
	db/zm_create.sql.in
	db/zm_update-1.28.99.sql
 2015-06-27 16:32:32 -05:00
Andrew Bauer 592ecd8e94 fix montage view issue in mobile skin 2015-06-26 08:47:20 -05:00
Isaac Connor 4be341986f Merge pull request #897 from pliablepixels/881-api-branch 
Fixed events API to remove thumbnail code
 2015-06-22 13:01:15 -04:00
Pliable Pixels 1a0d4d2221 Console now shows custom run state in header (if applicable) 2015-06-21 09:31:21 -04:00
Pliable Pixels 719a903d43 Fixed events API to remove thumbnail code 2015-06-20 20:08:10 -04:00
Pliable Pixels 138e931e24 Fixed events API to remove thumbnail code 2015-06-20 19:57:55 -04:00
Andrew Bauer 8d309fbd6e Merge pull request #874 from seeebek/master 
German translation update
 2015-06-19 13:50:55 +02:00
pliablepixels 7112001b64 getVersion.json now returns both ZM version and API version 2015-06-13 16:33:15 +00:00