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 |
Andy Bauer
|
466f2b2ae3
|
change multi-server error message text
|
2016-03-01 11:12:54 -06:00 |
arjunrc
|
84801fcb86
|
typo in function name
|
2016-02-27 13:06:33 -05:00 |
SteveGilvarry
|
b294f210dc
|
Update to CakePHP 2.8.0 copy in lib folder
|
2016-02-25 23:25:24 +11: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 |
|
Andrew Bauer
|
0b2a309014
|
Merge pull request #961 from Linwood-F/960-montage-review-new-feature
960 montage review new feature
|
2016-02-08 20:40:04 -06:00 |
Isaac Connor
|
d3755611c5
|
Merge pull request #1247 from bodegard/master
Corrected DB update version comments, fixed typos, and skin font modification
|
2016-02-04 11:54:02 -05:00 |
|
Andrew Bauer
|
ab7b4ab3e6
|
Merge pull request #1221 from ZoneMinder/rotate_dimensions_when_image_is_rotated
implement Width and Height functions, and test for image rotation and…
|
2016-02-04 10:17:19 -06:00 |
|
Andrew Bauer
|
1c142a48a6
|
Merge pull request #1212 from RBxx/patch-1
Convert ru_ru.php to UTF-8
|
2016-02-04 10:16:24 -06:00 |
|
Andrew Bauer
|
cbe88d0a3f
|
Merge pull request #1239 from ZoneMinder/trim_when_saving
use trim on values when saving.
|
2016-02-04 08:29:02 -06:00 |
|
Andrew Bauer
|
2f80f26f92
|
Merge pull request #1232 from ZoneMinder/remove_google_fonts
remove Google open Sans external import
|
2016-01-23 10:24:49 -06:00 |
Brandon Odegard
|
54a11175ff
|
Reduce default size of body font in Flat skin
|
2016-01-22 13:56:41 -06:00 |
|
Brandon Odegard
|
1ca9ace84d
|
Fixed missing semicolons
|
2016-01-22 13:31:02 -06:00 |
|
Isaac Connor
|
4520902dd2
|
use trim on values when saving.
|
2016-01-14 09:37:41 -05:00 |
|
Isaac Connor
|
3ebeaec8ab
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2016-01-10 20:59:01 -05:00 |
|
Isaac Connor
|
2d86e7713d
|
increase height of logout popup to fit content
|
2016-01-08 12:14:01 -05:00 |
|
Isaac Connor
|
d48ec1cfbe
|
Add AddNewServer and Hostname entries
|
2016-01-08 10:15:41 -05:00 |
|
Isaac Connor
|
99dfaa97fa
|
User Name instead of ServerName and Hostname instead of ServerHostname
|
2016-01-08 10:15:21 -05:00 |
|
Isaac Connor
|
d13829c6f3
|
Add Hostname to list of servers, since we have the space for it.
|
2016-01-08 10:15:06 -05:00 |
|
Isaac Connor
|
53bd342f85
|
remove Google open Sans external import
|
2016-01-08 09:46:14 -05:00 |
Isaac Connor
|
44f3b99d24
|
change logic to show server column if any servers are defined. Reason is that once you have setup 1, you want to know which cameras have not been assigned a server yet
|
2016-01-04 14:59:04 -05:00 |
Isaac Connor
|
6ae1597671
|
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
|
2016-01-04 14:51:47 -05:00 |
|
Isaac Connor
|
273ab6c5c6
|
Only show Server column when more than 1 Servers are defined
|
2016-01-04 14:51:24 -05:00 |
|
Isaac Connor
|
f5db14d823
|
return empty for the non multi-server case
|
2016-01-04 13:46:05 -05:00 |
|
Isaac Connor
|
45fc689203
|
implement Width and Height functions, and test for image rotation and output opposite dimension. Fixes #1220
|
2016-01-04 13:15:50 -05:00 |
|
Isaac Connor
|
f72260733c
|
Only do CORSHeaders if there is more than 1 server
|
2016-01-04 09:38:24 -05:00 |
|
Isaac Connor
|
d256530896
|
return early if no servers are defined instead of logging a warning
|
2016-01-04 09:36:45 -05:00 |
|
Isaac Connor
|
c639822d62
|
When Server is not set, us ZM_BASE_PATH
|
2016-01-03 11:55:53 -05:00 |
|
Isaac Connor
|
bd71c4999d
|
test for Server in servers_by_Id as well as just having a value for ServerId. Fixup export as well.
|
2016-01-02 14:36:37 -05:00 |
|
Isaac Connor
|
cf7e168872
|
Fix populating the server filter and then fix filtering by server. Also introduce robustness and consolel ogging when a filter doesn't exist
|
2016-01-01 17:10:37 -05:00 |
|
Isaac Connor
|
468f997e4c
|
Soft error, with logging when the filter element doesn't exist
|
2016-01-01 16:36:29 -05:00 |
|
Isaac Connor
|
ec7504f925
|
Translate ServerId to Server in Log record before sending back
|
2016-01-01 16:33:28 -05:00 |
|
Isaac Connor
|
12ee147bc7
|
Add a find_all function to return an array of Server objects
|
2015-12-31 10:13:48 -05:00 |
|
Isaac Connor
|
bfe4175fdf
|
Add Server to filters and log results
|
2015-12-31 10:13:25 -05:00 |
|
Isaac Connor
|
31ba0221ed
|
Add Server to filters and log results
|
2015-12-31 10:13:03 -05:00 |
|
Isaac Connor
|
983b47f6dc
|
Add Server columns
|
2015-12-31 09:09:57 -05:00 |