Isaac Connor
|
c9a1a9020d
|
Merge h264
|
2016-03-31 11:03:36 -04:00 |
|
Isaac Connor
|
e5a36c02bd
|
Merge remote-tracking branch 'origin/master' into video_remote
|
2016-03-30 16:55:24 -04:00 |
|
Isaac Connor
|
ea49dc20d1
|
Merge branch 'master' into storageareas
|
2016-03-30 10:58:07 -04:00 |
|
Isaac Connor
|
e9c65785e8
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-03-30 10:56:53 -04:00 |
Isaac Connor
|
247cb3d0b2
|
Merge pull request #1360 from schrorg/monitornames-spaces
Allow spaces in monitor names
|
2016-03-30 09:17:57 -04:00 |
Isaac Connor
|
0ab6e27259
|
Use Monitor object
|
2016-03-29 14:35:12 -04:00 |
|
Isaac Connor
|
f0a307e082
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
Conflicts:
distros/ubuntu1504_cmake/control
|
2016-03-29 11:53:17 -04:00 |
|
Isaac Connor
|
1ea1852476
|
Do some Storage Areas support
|
2016-03-29 11:52:25 -04:00 |
Robin Daermann
|
c8c0586c66
|
Trim monitor names
|
2016-03-29 11:40:14 +02:00 |
Andy Bauer
|
6eda3eff72
|
do not set maxfps fields during onvif probe
|
2016-03-26 08:38:28 -05:00 |
|
Robin Daermann
|
71db9b84e6
|
Allow spaces in monitor names
|
2016-03-24 14:37:24 +01:00 |
|
Isaac Connor
|
a66e97de09
|
Merge & fix new console & options
|
2016-03-23 09:48:57 -04:00 |
|
Isaac Connor
|
3a8352eb6b
|
Merge branch 'master' into storageareas
|
2016-03-21 10:25:03 -04:00 |
Kyle Johnson
|
897a0a995c
|
Convert options layout to side-tabs, and improve readability
|
2016-03-15 15:21:28 -04:00 |
|
Kyle Johnson
|
87932002cf
|
Push the options page down a bit to make tab look better
|
2016-03-15 14:45:40 -04:00 |
|
Kyle Johnson
|
183f58ad17
|
Restyle options view with horizontal form layout
|
2016-03-15 14:43:22 -04:00 |
|
Kyle Johnson
|
694ad0b539
|
Add styling to delete / save / add buttons in options.php
|
2016-03-15 14:08:01 -04:00 |
|
Kyle Johnson
|
bd30d40522
|
Remove cancel button from options as it no longer makes sense.
|
2016-03-15 14:03:17 -04:00 |
|
Kyle Johnson
|
0004a1180e
|
Update options.php to use bootstrap container
|
2016-03-15 13:56:54 -04:00 |
|
Kyle Johnson
|
26748c2de5
|
Oops. Move Console view outside of canView(system) restriction
|
2016-03-15 13:52:36 -04:00 |
|
Kyle Johnson
|
f05c1548ce
|
Add a link back to console in header
|
2016-03-15 13:49:14 -04:00 |
|
Kyle Johnson
|
299c61c1ec
|
Make the Options link a standard href (not a popup).
|
2016-03-15 13:47:31 -04:00 |
|
Kyle Johnson
|
8070bf8700
|
Move console php code to header as that code is now needed in additional views.
|
2016-03-15 13:46:03 -04:00 |
|
Kyle Johnson
|
49f46ac927
|
Move the header into its own file, and include it in options view.
|
2016-03-15 13:43:49 -04:00 |
|
Kyle Johnson
|
8acfe1b0d8
|
Update options styling
|
2016-03-12 22:44:11 -05:00 |
|
Kyle Johnson
|
2378c9a359
|
Fix state link to do popup like before
|
2016-03-12 20:44:42 -05:00 |
|
Kyle Johnson
|
d202760d82
|
Additional footer padding
|
2016-03-12 20:37:07 -05:00 |
|
Kyle Johnson
|
f5ba52824a
|
Add styles to additional console buttons
|
2016-03-12 20:36:39 -05:00 |
|
Kyle Johnson
|
a2c2101c48
|
Remove extra #footer styling
|
2016-03-12 20:28:16 -05:00 |
|
Kyle Johnson
|
f80cbf52df
|
Bump up the default font size
|
2016-03-12 20:27:51 -05:00 |
|
Kyle Johnson
|
bebb1017fd
|
Wrap footer in container-fluid
|
2016-03-12 20:27:22 -05:00 |
|
Kyle Johnson
|
5e2d4bc325
|
Restyle of Login page.
|
2016-03-12 20:11:32 -05:00 |
|
Kyle Johnson
|
a403c1db8c
|
Move recaptcha javascript to actual <head> tag
The way it was handled previously resulted in invalid html, with an
extra <head> tag being inserteed inside the <body>.
|
2016-03-12 19:14:07 -05:00 |
|
Kyle Johnson
|
71c35e712b
|
Initial major restyle of classic skin.
|
2016-03-12 03:28:02 -05:00 |
|
Kyle Johnson
|
c9441ec8c0
|
Local copy of bootstrap 3.3.6, included in classic skin.
|
2016-03-12 01:16:19 -05:00 |
Andrew Bauer
|
77f7a3642c
|
remove check for "selected" property
|
2016-03-09 10:34:06 -06:00 |
|
Andrew Bauer
|
3280aff876
|
disable save button when nothing slected. fixes #1322
|
2016-03-09 09:43:44 -06:00 |
|
Isaac Connor
|
b06b82f634
|
widen filter popup, because storage area name or server name might be longer
|
2016-03-04 15:35:55 -05:00 |
|
Isaac Connor
|
86dbe4fa15
|
define default for StorageId to prevent error message
|
2016-03-03 09:22:53 -05:00 |
|
Isaac Connor
|
bcb403bf08
|
Merge branch 'fix_setButtonStates' into storageareas
|
2016-03-03 09:08:37 -05:00 |
|
Isaac Connor
|
c0ed40fd06
|
fix structure of if/for
|
2016-03-03 09:06:57 -05:00 |
|
Isaac Connor
|
cedc46adf3
|
Merge branch 'fix_setButtonStates' into storageareas
|
2016-03-02 09:12:19 -05:00 |
|
Isaac Connor
|
bb0dcf3d43
|
fix setButtonStates. The checkboxes are an array.
|
2016-03-01 12:19:46 -05:00 |
|
Isaac Connor
|
131d0daefe
|
fix syntax
|
2016-02-19 11:47:18 -05:00 |
|
Isaac Connor
|
afb0cf2a7e
|
Merge branch 'master' into storageareas
|
2016-02-19 11:09:18 -05:00 |
|
Isaac Connor
|
5a2a4baa89
|
Must load StorageId as well when loading event
|
2016-02-19 09:47:19 -05:00 |
|
Isaac Connor
|
68babd783b
|
Merge branch 'master' into storageareas
|
2016-02-17 09:46:56 -05:00 |
Dmitry Smirnov
|
632e9c8e53
|
Upgrade bundled jQuery (Closes: #1263)
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
|
2016-02-18 00:28:30 +11:00 |
|
Isaac Connor
|
172a4c6bd4
|
Add montagereview.php to autotools build.
|
2016-02-16 09:29:49 -05:00 |
|
Isaac Connor
|
292e3a141f
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-02-12 13:53:34 -05:00 |