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
Andrew Bauer
32f6c92b02
replace php short open tag
2015-08-16 12:29:03 -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
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
Robin Daermann
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
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
Isaac Connor
02ee745167
parameter to defined should be in quotes
2015-07-17 10:09:22 -04: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
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
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
Pliable Pixels
1a0d4d2221
Console now shows custom run state in header (if applicable)
2015-06-21 09:31:21 -04:00
Isaac Connor
c8e41319e6
fix state popup dimensions
2015-06-03 12:22:12 -04:00
Isaac Connor
f99c5f3627
use correct tag for the frame popup so that it gets the correct popup window size
2015-06-03 12:09:38 -04:00
Andrew Bauer
bf4038a724
followup changes based on comments in #833
2015-05-21 12:23:31 -05:00
Andrew Bauer
3a94712db2
add translate function
2015-05-10 08:10:30 -05:00
Andrew Bauer
8a1625463c
Merge pull request #823 from ZoneMinder/fix_session_concurrency
...
close the session before requiring the page contents to fix the concurre...
2015-05-09 17:50:18 -05:00
Isaac Connor
9ecc934927
add the new js files for classic flat skins
2015-05-01 16:50:44 -04:00
Isaac Connor
013009f127
fix the css .js file name
2015-05-01 16:50:29 -04:00
Isaac Connor
91737eb28b
also reference a js file with the name of the chosen css. This is so that we can use different popup window sizes for flat because it's text and buttons are so much larger.
2015-05-01 16:03:40 -04:00
Isaac Connor
73cc4e5cab
move the window size definitions into a separate file for each css version flat or classic
2015-05-01 16:02:55 -04:00
Isaac Connor
01af58018b
close the session before requiring the page contents to fix the concurrency issue that exists due to using the file-backed session.
2015-04-20 13:06:34 -04:00
Emmanuel Papin
81eaf44595
Fix a bad SLANG key in monitor.php
2015-04-18 19:37:56 +02:00
Emmanuel Papin
216348274b
Remove a remaining hardcoded string
2015-04-18 18:14:36 +02:00
Emmanuel Papin
ac8ace33f8
Remove hardcoded localized strings and update lang files
2015-04-18 17:14:14 +02:00
Dmitry Smirnov
b2f6bfb5fc
upgrade bundled jQuery ( Closes : #785 )
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-04-15 11:39:29 +10:00
SteveGilvarry
98d91ded90
Found some introduced short tags
2015-04-08 20:13:27 +10:00
SteveGilvarry
45fd7f1eca
Found some old open tags left over
2015-04-08 20:11:26 +10:00
Dmitry Smirnov
d1f00f02c2
skins/classic: fix HTML export with USE_DEEP_STORAGE ( Closes : #506 ).
...
Use mygetEventPath() to get valid path.
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-04-04 20:39:06 +11:00
Isaac Connor
1a17c820f2
Merge pull request #730 from ljack/master
...
Fix image and css import paths for style/skin named "flat"
2015-02-25 11:51:42 -05:00
ljack
e9384d445a
fix .upBtn and .downBtn also for "flat" css
2015-02-25 18:10:40 +02:00
ljack
8616fdb33d
fix import path
2015-02-25 18:09:23 +02:00
ljack
6233432559
fix import path
2015-02-25 18:08:41 +02:00
ljack
48950f3f1c
Update control.css
...
Update paths for .upBtn and .downBtn too
2015-02-25 09:24:19 +02:00
Isaac Connor
362153cb3a
Also fix video.pho which has the same problem.
2015-02-23 14:34:13 -05:00
Isaac Connor
bff26154b0
Also fix video.pho which has the same problem.
2015-02-23 14:31:15 -05:00
Isaac Connor
c9f109bc27
also fix timeline which has the same problem
2015-02-23 14:27:35 -05:00