Emmanuel Papin
|
b294569147
|
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support
Merging conflicts fixed in files:
CMakeLists.txt
configure.ac
distros/debian_cmake/control
src/zm_monitor.h
web/lang/de_de.php
web/skins/classic/views/monitor.php
|
2015-07-20 16:49:04 +02:00 |
Andrew Bauer
|
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 |
Isaac Connor
|
02ee745167
|
parameter to defined should be in quotes
|
2015-07-17 10:09:22 -04:00 |
root
|
a9df82256b
|
Change encoding of web/lang/de_de.php from ISO-8859-1 to UTF-8
|
2015-07-17 14:24:46 +02: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 |
Pliable Pixels
|
444d978c81
|
Added API routing
|
2015-07-13 18:55:28 +00: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 |
Isaac Connor
|
42ac3ceb3b
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2015-07-09 11:00:05 -04:00 |
Isaac Connor
|
51631b84b4
|
cleanup generated files
|
2015-07-09 10:59:45 -04:00 |
Andrew Bauer
|
8406818b00
|
Merge pull request #921 from pliablepixels/master
Added "RewriteBase /zm/api" for API routing
|
2015-07-05 08:34:28 -05:00 |
Pliable Pixels
|
3a9c941213
|
Added "RewriteBase /zm/api" for API routing
|
2015-07-05 08:59:07 -04:00 |
Andrew Bauer
|
1b2f214340
|
Dumb down Crud from 4.0 -> 3.0.10
|
2015-06-30 10:26:29 -05: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 |
Isaac Connor
|
4be341986f
|
Merge pull request #897 from pliablepixels/881-api-branch
Fixed events API to remove thumbnail code
|
2015-06-22 13:01:15 -04:00 |
Pliable Pixels
|
1a0d4d2221
|
Console now shows custom run state in header (if applicable)
|
2015-06-21 09:31:21 -04:00 |
Pliable Pixels
|
719a903d43
|
Fixed events API to remove thumbnail code
|
2015-06-20 20:08:10 -04:00 |
Pliable Pixels
|
138e931e24
|
Fixed events API to remove thumbnail code
|
2015-06-20 19:57:55 -04:00 |
Andrew Bauer
|
8d309fbd6e
|
Merge pull request #874 from seeebek/master
German translation update
|
2015-06-19 13:50:55 +02:00 |
pliablepixels
|
7112001b64
|
getVersion.json now returns both ZM version and API version
|
2015-06-13 16:33:15 +00:00 |
pliablepixels
|
12ba217de0
|
Added API version in addition to ZM version, also added loadConfig code that was there in the angular-ui branch but not merged to master
|
2015-06-13 16:32:37 +00:00 |
Isaac Connor
|
bda35ed4d6
|
fix bootstrap.ini substitution
|
2015-06-12 11:12:58 -04:00 |
Isaac Connor
|
ecb7720056
|
Merge pull request #882 from pliablepixels/881-merge-angularui-apis
Merged Angular UI branch API to master
|
2015-06-12 11:06:59 -04:00 |
Andrew Bauer
|
d915d859ed
|
Convert Crud to submodule
|
2015-06-11 11:56:39 -05:00 |
Ubuntu
|
dd9603f70f
|
Merged Angular UI branch API to master
|
2015-06-11 02:58:58 +00:00 |
Emmanuel Papin
|
2acfe5b395
|
Fix plugin window title name
|
2015-06-06 18:35:43 +02:00 |
Sebastian Kaminski
|
f3a8217651
|
resolve conflicts from merge by seebaer1976
|
2015-06-05 19:34:52 +02:00 |
Isaac Connor
|
e10fdaf344
|
reduce the wait to 2/10ths instead of a whole second
|
2015-06-05 11:49:05 -04:00 |
Emmanuel Papin
|
e2957702b5
|
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support
|
2015-06-04 20:57:34 +02: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 |
seebaer1976
|
4cf1e61197
|
Update de_de.php
|
2015-05-31 17:43:21 +02:00 |
Emmanuel Papin
|
905237d7a6
|
Fix undefined variable issue with pOptions and call only pLang for translation
|
2015-05-30 14:33:15 +02:00 |
Emmanuel Papin
|
eff56664c3
|
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support
Conflicts:
web/lang/de_de.php
web/skins/classic/views/monitor.php
web/skins/classic/views/plugin.php
|
2015-05-28 23:43:13 +02:00 |
Sebastian Kaminski
|
ba980ae4ae
|
update german translation
|
2015-05-27 15:38:47 +02:00 |
Andrew Bauer
|
bf4038a724
|
followup changes based on comments in #833
|
2015-05-21 12:23:31 -05:00 |
Isaac Connor
|
5876186909
|
Merge pull request #803 from knnniggett/mootools
Update Mootools
|
2015-05-21 13:15:13 -04:00 |
Isaac Connor
|
b7890ec923
|
Merge pull request #833 from knnniggett/slang
add translate function
|
2015-05-21 13:14:44 -04:00 |
Emmanuel Papin
|
eb9e01eb00
|
Increase height of plugin window
|
2015-05-16 07:36:08 +02:00 |
Emmanuel Papin
|
2b770b2f58
|
Add an error message if plugin option is not valid
|
2015-05-16 06:12:38 +02:00 |
Emmanuel Papin
|
0241f844d2
|
Add space in array formatting
|
2015-05-15 08:11:51 +02:00 |
Emmanuel Papin
|
775da60382
|
Remove any call to ['Name']
|
2015-05-14 20:49:36 +02:00 |
Emmanuel Papin
|
676968ed04
|
Add list option for plugins
|
2015-05-14 11:38:38 +02:00 |
Emmanuel Papin
|
6b2c435460
|
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support_list
Conflicts:
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
|
2015-05-14 11:12:38 +02:00 |
Isaac Connor
|
82f5ab5175
|
Fix use of DEFINED. It takes a string not a constant. When COOKIE is not set or has changed, set it
|
2015-05-11 16:22:14 -04: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 |
Andrew Bauer
|
69ccd53653
|
rollback mootools-core to 1.4.5-compat
|
2015-05-09 17:23:01 -05:00 |
Emmanuel Papin
|
49116a27d7
|
Fix a conflict with php variable
|
2015-05-06 23:16:09 +02:00 |