3368d4f474
Removed untranslated "Font size" from language files, corrected white
...
space and make font size a const int
2015-08-10 15:35:19 +02:00
078e18e6c5
Add label size to monitor options (frontend part)
...
This commit adds the option "Font size" to monitor options in the
timestamp panel. Includes translations of "Font size" for german
(de_de), french (fr_fr) and spanish (es_es). All other language files
contain the english text.
2015-08-10 15:35:19 +02:00
7f3a07f21b
Add label size to monitor options (database and backend part)
...
This commit bumps version to 1.28.101 because of database schema change
2015-08-10 15:35:18 +02:00
5a0d0ca5a3
Made large font selectable by a constant
2015-08-06 17:42:52 +02:00
c733fec476
First (working) steps for adding large timestamp to images
2015-08-06 14:43:10 +02:00
485cf88120
Merge pull request #990 from schrorg/dark-css
...
Implemented #989 (highlight current row in tables) for dark CSS
2015-08-05 09:50:36 -04:00
37e01b504b
Implemented #989 (highlight current row in tables) for dark CSS
2015-08-05 14:36:07 +02:00
2e1a145eb0
Merge pull request #989 from onlyjob/CSS
...
CSS[skins/classic]: highlight current row in tables.
2015-08-04 21:15:09 -04:00
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
d9ee08a27b
Merge pull request #983 from Linwood-F/982-demote-terminating-logger-msg-to-debug
...
Change from info to debug
2015-08-04 10:12:08 -04:00
a36bee3767
Merge pull request #984 from Linwood-F/507-shared-data-for-purpose-query-warning
...
Remove shared data warning for purpose query only
2015-08-04 10:09:59 -04:00
546b0dd353
Remove shared data warning for purpose query only
2015-08-03 20:37:17 -04:00
2538514d18
Change from info to debug
2015-08-03 18:39:14 -04:00
09d2162f1b
Merge pull request #980 from ZoneMinder/fix_image_dimensions_check
...
Fix image dimensions check
2015-07-31 09:40:18 -05:00
abd4ee6ca8
Merge branch 'master' into fix_image_dimensions_check
2015-07-31 10:30:31 -04:00
46b9bd5d1c
change the captured image size to camera image size check to be a > instead of !=. As long as we have enough buffer space, it doesn't matter if the captured image is smaller than what we defined.
2015-07-31 10:29:53 -04:00
2dcc118deb
Merge pull request #967 from schrorg/dark-css
...
Dark CSS for classic theme
2015-07-30 07:18:42 -05:00
651cffd3b5
Small color corrections in tabList
2015-07-27 10:07:01 +02:00
14ebd937c7
Added missing javascript file to Makefile.am
2015-07-27 09:53:59 +02:00
57843cc0c8
Added new Makefiles to configure.ac for dark CSS
2015-07-27 09:53:59 +02:00
5588406570
Add dark CSS for classic view
2015-07-27 09:53:59 +02:00
911f0fad28
Use destination color from CSS in transition effect in log view (instead
...
of #000000 )
2015-07-27 09:53:59 +02:00
a206d46248
Update README.md
2015-07-24 14:01:25 -05:00
a64bbd0b56
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-07-24 13:42:07 -04:00
3e5f6c65d3
Fix to scale, moving the +1's into the buffer allocation instead of calculation of new_width and new_height
2015-07-24 13:30:58 -04:00
b90d8c4f73
db_get fails if there is no debconf entry (for example if the package is not yet configured)
2015-07-23 15:08:06 -04:00
27ef821a4f
db_get fails if there is no debconf entry (for example if the
...
package is not yet configured)
2015-07-23 15:07:32 -04:00
a6a33fa77f
Merge pull request #955 from pliablepixels/953-configs-API-fix
...
Fixed Configs API to return all values
2015-07-21 12:42:41 -05:00
e332fc36a9
Fixed Configs API to return all values
2015-07-21 13:28:37 -04:00
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
02ee745167
parameter to defined should be in quotes
2015-07-17 10:09:22 -04:00
712d3959d2
Merge pull request #951 from schrorg/950-correct-ffmpeg-source
...
Show correct part of URL (hostname) for ffmpeg sources in console
2015-07-17 08:37:17 -05:00
a9df82256b
Change encoding of web/lang/de_de.php from ISO-8859-1 to UTF-8
2015-07-17 14:24:46 +02:00
560a4cccbe
Show correct part of URL (hostname) for ffmpeg sources in console
2015-07-17 13:59:40 +02:00
10adae3696
Merge pull request #941 from ZoneMinder/trigger_on_space
...
add space instead of + to handle old Axis cameras
2015-07-16 13:09:36 -05:00
e1a30cf4e5
Merge pull request #942 from ZoneMinder/add_db_functions
...
add some utility db functions
2015-07-16 13:08:49 -05:00
fffea54ed1
Merge pull request #944 from ZoneMinder/php-gd
...
add php-gd to list of dependencies for debian and ubuntu builds
2015-07-16 13:08:33 -05:00
424b7d50bd
php-gd should isntead be php5-gd
2015-07-16 13:59:06 -04:00
ef19d5df8a
Merge pull request #943 from knnniggett/php-gd
...
rpm packaging - require php-gd
2015-07-16 13:40:38 -04:00
e3042c59a5
add php-gd to list of dependencies for debian and ubuntu builds
2015-07-16 13:40:16 -04:00
eb5bb641d6
rpm packaging - require php-gd
2015-07-16 12:15:24 -05:00
ad23969982
add space instead of + to handle old Axis cameras
2015-07-16 13:06:15 -04:00
48fa0c3d42
add some utility db functions
2015-07-16 13:04:28 -04:00
a53ee60590
Merge pull request #938 from onlyjob/zmtrigger
...
zmtrigger: POD documentation
2015-07-16 06:47:59 -05:00
c788d70b93
zmtrigger: POD documentation
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-07-16 18:35:42 +10:00
4e5ca2cead
Merge pull request #937 from ZoneMinder/better_logging
...
improve log
2015-07-15 15:21:08 -05:00
104f375669
Merge pull request #936 from ZoneMinder/handle_serial_trigger_problem
...
add error handling on failure to open serial port
2015-07-15 15:20:56 -05:00
01518d6aa9
fix. without this zmc won't restart automatically
2015-07-15 16:08:02 -04:00
e4b3344a8c
improve log
2015-07-15 16:06:55 -04:00
cf3f160783
add error handling on failure to open serial port
2015-07-15 16:02:02 -04:00
Robin Daermann
Isaac Connor
Dmitry Smirnov
Linwood-F
Andrew Bauer
Isaac Connor
Isaac Connor
Pliable Pixels
Andrew Bauer