320218d5c2
Merge branch 'master' into zma_to_thread
2018-11-20 11:58:44 -05:00
3be31020b7
Automatically add width to frames view when thumbnails are turned on.
2018-11-14 15:54:01 -05:00
86b0e4ea18
fix auth_hash. Should use generateAuthHash instead of accessing session directly
2018-10-22 18:32:39 -04:00
5ab1126260
Merge branch 'storageareas' into zma_to_thread
2018-10-20 17:31:14 -04:00
d1bef49d0b
Don't reload on a timeout when refreshing the navbar
2018-10-11 11:30:30 -04:00
592f55a550
do a location.reload instead of trying to guess what the current url is. Should solve permission denied problem when watching live view and auth times out.
2018-10-01 10:39:00 -04:00
672b4affe1
Merge branch 'storageareas' into zma_to_thread
2018-08-31 19:05:22 -04:00
40cd27e68a
when refreshing because ajax failed, reload the current view, not just index.php
2018-08-15 17:21:54 -04:00
979b31ffc3
Merge branch 'storageareas' into zma_to_thread
2018-08-11 10:08:30 -04:00
2ff47e04da
the updated video-js.css puts the fonts into a font dir.
2018-07-25 17:04:42 -04:00
00bdfdcb16
increase height of function popup so that dropdown options fit in it
2018-07-25 09:39:24 -04:00
dc57a3c91c
fix spacing/quotes/google code style
2018-07-24 16:41:09 -04:00
2767e7cca3
remove unneeded packaging files from chosen.
2018-07-12 11:35:02 -04:00
7db1fabbe1
Removed "chosen" web site; "prism.js" is not distributable. ( #2154 )
2018-07-11 15:46:43 -04:00
77fbfccee0
fix #2149
2018-07-10 10:31:43 -04:00
b5ca671103
Misc JS hygiene ( #2150 )
...
* fixed "jquery-ui.js" symlink.
* Bootstrap source, matching minified version.
Also origin URL.
* moment.js: added missing source and URL of origin.
* video-js: replaced bad case of source-less minified binary.
Original file was not identical to https://github.com/videojs/video.js/blob/v4.11.4/dist/video-js/video-js.min.css
i.e. it was modified in unknown way without sources. Very bad.
* jQuery: renamed URL file for consistency
* mootools-core-compat.js: replaced original with unknown modifications; renamed; added origin URL.
* mootools-more: rename file to properly reflect version.
This is a default build without any options.
* prism.js.FIXME: note about outdated source-less file.
2018-07-07 10:30:16 -04:00
55f2e7c6a2
Fix #2124 . Always allow selection of checkboxes, include canEdit(Events) in button disabling.
2018-06-15 15:21:10 -04:00
37badbfb17
fix #2123
2018-06-12 08:58:19 -04:00
405b1f92ed
add a .fail to log the errors given when a navbar ajax call fails
2018-05-31 10:25:53 -04:00
4454ca0072
Merge branch 'storageareas' into zma_to_thread
2018-05-20 10:39:14 -04:00
780cb693c2
google code style
2018-05-16 11:14:11 -04:00
cd3046abb3
Merge branch 'storageareas' into zma_to_thread
2018-04-14 11:03:08 -04:00
7d4652e37b
make group and function popups bigger
2018-03-21 11:33:10 -07:00
ebb0c9eec6
Merge branch 'storageareas' into zma_to_thread
2018-02-14 13:56:30 -05:00
4c1abf93ba
fixup navbarreloader wrt auth_hash
2018-02-14 13:16:14 -05:00
4df8cdc685
add auth_hash updating to the navbar reload.
2018-02-14 10:44:48 -05:00
dca1de4a13
Merge branch 'storageareas' into zma_to_thread
2018-02-08 13:30:57 -05:00
1ed8af8aac
upgrade jquery-ui to 1.12.1
2018-02-08 13:19:16 -05:00
4b6f40dd9f
Merge branch 'storageareas' into zma_to_thread
...
Conflicts:
src/zm_monitor.cpp
2018-02-08 12:40:24 -05:00
d857c2c98a
increase download popup height
2018-02-08 09:29:54 -08:00
573c44839a
Merge branch 'storageareas' into zma_to_thread
2018-01-16 17:39:37 -05:00
6a36db0b6d
move flat skin to base.
2018-01-11 12:24:53 -05:00
3ba6760f1b
increase logout popup size
2018-01-11 10:58:06 -05:00
e16852ee8e
fix compile, impose minimum 10 second event length
2017-12-18 13:39:08 -05:00
c8cfb47f9f
More bootstrap in datepicker
2017-12-16 23:10:19 -05:00
9d87f7fe18
Use bootstrap icons in datepicker
2017-12-16 20:10:02 -05:00
a091153929
Use seperate structure and theme jquery ui
2017-12-16 20:04:12 -05:00
d7532b0340
Add dateTime picker to filter
2017-12-15 22:57:42 -05:00
ecf5cfc767
Merge branch 'storageareas' into zma_to_thread
2017-12-14 13:41:41 -05:00
abad266c5b
introduce chosen to use it to make the filtering dropdowns awesome
2017-12-13 16:15:03 -05:00
49908c11da
Merge branch 'storageareas' into zma_to_thread
2017-12-11 13:51:32 -05:00
7108e306cb
add popup sizes for server and storage. Increase height of user edit popup
2017-12-11 12:50:30 -05:00
933cdedaa6
Merge branch 'storageareas' into zma_to_thread
2017-12-06 11:58:29 -05:00
11a5a47826
Fix missing popups and styles
2017-12-06 09:42:58 -05:00
34b708bace
Handle popups that should remain popups
2017-12-05 09:40:03 -05:00
a27374b827
Merge branch 'storageareas' into zma_to_thread
2017-12-04 17:11:46 -05:00
588f63b053
Merge branch 'storageareas' into zma_to_thread
2017-12-04 17:07:16 -05:00
c72b1f3acf
Fix refreshParent on some popups
...
Some popups wouldn't refresh the parent because after submit the none view page does not include jquery. This angers javascript and prevents the close function from working. Only fire header refresh code if there is a view.
2017-12-04 17:04:53 -05:00
3e7c573da5
Add download video option to events view
...
Creates a new popup window for downloading event video files with no directory structure in the archive
2017-12-03 14:42:07 -05:00
bab308ffa8
Merge branch 'storageareas' into zma_to_thread
2017-12-03 12:43:31 -05:00
Isaac Connor
Isaac Connor
Dmitry Smirnov
Isaac Connor
Isaac Connor
digital-gnome