mdtrooper
30f806f41c
Merge branch 'develop' into feature/new_networkmap
...
Conflicts:
pandora_console/include/functions_modules.php
2016-04-25 15:25:16 +02:00
Axel
646bf107e3
Update Dockerfile
...
Added SSH client
2016-03-31 12:59:12 +02:00
mdtrooper
16812b55b5
Merge branch 'develop' into feature/new_networkmap
2016-03-29 13:46:59 +02:00
axl89
e12924d579
Included the Dockerfile and its dependencies for server, console and database Docker images
2016-03-23 11:52:15 +01:00
mdtrooper
c6f65455e7
Some fixes in the arrows.
2016-03-03 15:08:05 +01:00
mdtrooper
c4dc71e4f7
Some changes for the async javascript for several arrows
2016-03-02 14:30:52 +01:00
Arturo Gonzalez
b206f2a5d3
Added a second pair of cats to test with two arrows.
2016-03-01 17:09:38 +01:00
mdtrooper
834d3c3e5b
Some work in the new networkmaps
2016-03-01 16:37:10 +01:00
Arturo Gonzalez
5f7d65eba1
New maps in progress... (document arrows code)
2016-03-01 09:45:13 +01:00
mdtrooper
b741209002
The arrow in parts.
2016-02-29 16:12:17 +01:00
mdtrooper
84f50f291c
The arrow in parts.
2016-02-29 15:41:22 +01:00
mdtrooper
6590a64929
Some work in the example file cats.html
2016-02-29 15:14:25 +01:00
mdtrooper
2da646006f
I love the cats with potatoes and carrots.
2016-02-29 09:23:43 +01:00
mdtrooper
a93a7c67ff
It is my cat and I 'play' with him as I wish
2016-02-26 15:05:48 +01:00
KIKUCHI Koichiro
2a8af087e6
Update version in string in installer files
2015-11-13 12:22:12 +09:00
Arturo Gonzalez Diaz
358c192e5e
Fixed error in oracle db scheme version.
2015-09-09 10:51:53 +02:00
Arturo Gonzalez Diaz
909c2c3b99
Modified db update to introduce oracle db update. Ticket #2663
2015-09-08 15:42:26 +02:00
Ramon Novoa
15786e7b04
Added the wmi .spec contributed by Robert B. Nelson with small changes.
...
(cherry picked from commit 829c11f99f
)
2015-06-16 16:12:31 +02:00
m-lopez-f
acfd2146dc
Change views and styles in Console
2015-04-01 12:09:23 +02:00
Ramon Novoa
6163b68bdd
Do not build RPM or DEB packages for the Enterprise Server.
2015-01-27 09:44:25 +01:00
m-lopez-f
1b34212fff
changed style and adapt to style pandorafms.
2015-01-20 10:11:47 +01:00
Alejandro Gallardo Escobar
8e5dadd7ca
Removed the ChangeLog files :D
2014-09-09 17:41:42 +02:00
pandora-release
4c4ed32007
Updated the build scripts to work with the new git repo.
2014-09-01 18:13:26 +02:00
pandora-release
dddebcbbcc
Fixed a syntax error.
...
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10219 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-17 13:52:38 +00:00
pandora-release
5047ab161a
Update the satellite server version.
...
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10216 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-17 11:16:23 +00:00
pandora-release
5efa5f1527
Build enterprise server RPM packages.
...
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10116 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-05 09:29:01 +00:00
Ramon Novoa
7916b64e26
2014-06-05 Ramon Novoa <rnovoa@artica.es>
...
* build_deb.sh,
build_rpm.sh,
build_src.sh: Build enterprise server packages, since we are having
issues with ActiveState binaries.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10115 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-05 09:04:00 +00:00
pandora-release
a93ddb9356
Do not generate a link for the enterprise server.
...
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9985 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-05-22 13:07:26 +00:00
pandora-release
ebcf4cfc95
Do not build the enterprise server from sources.
...
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9975 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-05-21 09:21:28 +00:00
mariopulido
adcbe2ec5e
2014-03-11 Mario Pulido <mario.pulido@artica.es>
...
* aditional_rpmspec/nfdump-1.6.8p1-1.redhat.spec: Add spec to create nfdump rpms.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9551 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-11 11:17:36 +00:00
pandora-release
b2cc0d2747
Reverted the previous commit. This changes belong into the 5.0 branch.
...
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9463 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-24 14:59:25 +00:00
pandora-release
77197f6fa4
Updated to build the 5.0 branch.
...
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9462 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-24 14:54:30 +00:00
slerena
25626dd5f3
2014-02-24 Sancho Lerena <slerena@artica.es>
...
* pandorafms-agent.spec: Lots of changes to adapt spec to fedora standards.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9460 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-24 01:08:19 +00:00
mdtrooper
8d8899e597
2014-02-12 Miguel de Dios <miguel.dedios@artica.es>
...
* src/pandorafms/pandorafmsandroidconsole/PandoraWebView.java: fixed
the access with passwords or users with non-ascii characters.
* AndroidManifest.xml: update the version.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9433 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-12 15:42:17 +00:00
slerena
fdc1c88dd6
2014-02-01 Sancho Lerena <slerena@artica.es>
...
* fedora_official_specs: Added new directory to maintain the official specs
for fedora/centos/EPEL. Not yet official, but going on...
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9394 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-01 18:18:04 +00:00
Ramon Novoa
b4c91bc31c
2014-01-24 Ramon Novoa <rnovoa@artica.es>
...
* build_rpm.sh,
build_rpm_redhat.sh,
build_src.sh: Remove the keygen from the build scripts (it is not used
anymore).
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9365 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-01-24 09:51:04 +00:00
mdtrooper
89b0986267
2013-12-16 Miguel de Dios <miguel.dedios@artica.es>
...
* res/values/strings.xml, res/values-es/strings.xml,
res/values-ja/strings.xml: update the names of Pandora.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9234 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-12-16 11:10:57 +00:00
mdtrooper
03569a57ab
2013-12-13 Miguel de Dios <miguel.dedios@artica.es>
...
* res/drawable-ldpi/icon_logo_pandorafms.png,
res/drawable-ldpi/pandorafms_logo.png, ic_launcher-web.png: updated
the icons, thanks Carla.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9224 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-12-13 12:03:43 +00:00
mdtrooper
9091151c2e
2013-12-13 Miguel de Dios <miguel.dedios@artica.es>
...
* AndroidManifest.xml: changed the android version support for to
show the option button.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9222 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-12-13 09:31:24 +00:00
mdtrooper
fd21f6b1b6
2013-12-13 Miguel de Dios <miguel.dedios@artica.es>
...
* src/pandorafms/pandorafmsandroidconsole/ConnectionCustomToast.java:
cleaned source code style.
* res/drawable-ldpi/pandorafms_logo.png: update the icon.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9220 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-12-13 09:18:41 +00:00
mdtrooper
c325bc13a1
2013-12-12 Miguel de Dios <miguel.dedios@artica.es>
...
* res/drawable-ldpi/refresh.png, res/drawable-ldpi/config.png,
res/drawable-ldpi/help.png, res/drawable-ldpi/exit.png: updated the
icons for the option menu, thanks Carla.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9214 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-12-12 08:52:56 +00:00
mdtrooper
c4120ef440
2013-12-10 Miguel de Dios <miguel.dedios@artica.es>
...
* src/pandroid_event_viewer/pandorafms/EventList.java: fixed Java
warning.
* res/drawable-ldpi/config.png, res/drawable-ldpi/about.png: changed
the icons to green icons, thanks Carla.
* AndroidManifest.xml: incremented the version number.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9202 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-12-10 15:11:25 +00:00
mdtrooper
0032039a22
2013-12-09 Miguel de Dios <miguel.dedios@artica.es>
...
* src/pandroid_event_viewer/pandorafms/EventList.java: fixed the
incident dialog when two times.
* src/pandroid_event_viewer/pandorafms/Options.java: updated the
api password for the pandora_demo in firefly.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9194 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-12-09 13:36:38 +00:00
mdtrooper
10112092ec
2013-12-09 Miguel de Dios <miguel.dedios@artica.es>
...
* src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java,
src/pandroid_event_viewer/pandorafms/EventList.java,
src/pandroid_event_viewer/pandorafms/Main.java: fixed Java warnings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9190 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-12-09 10:20:48 +00:00
mdtrooper
58192320b8
2013-12-05 Miguel de Dios <miguel.dedios@artica.es>
...
* src/pandroid_event_viewer/pandorafms/Main.java: setted the
standar style for group and tag dropbox.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9181 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-12-05 17:24:51 +00:00
mdtrooper
a31b4bf4ae
2013-12-05 Miguel de Dios <miguel.dedios@artica.es>
...
* src/pandroid_event_viewer/pandorafms/Options.java: fixed the save
state of check in background, before it run but didn't show.
* res/layout/main.xml: added id for the tag.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9180 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-12-05 17:13:23 +00:00
mdtrooper
c2ff2a31c0
2013-12-05 Miguel de Dios <miguel.dedios@artica.es>
...
* src/pandroid_event_viewer/pandorafms/Info.java,
src/pandroid_event_viewer/pandorafms/About.java: changed the url
of about.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9178 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-12-05 16:29:21 +00:00
mdtrooper
ccda3faebd
2013-12-05 Miguel de Dios <miguel.dedios@artica.es>
...
* src/pandroid_event_viewer/pandorafms/Main.java: fixed to check the
pandora version for 4 series, this is for to hidden the tag filter.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9166 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-12-05 11:28:34 +00:00
mdtrooper
2760579ccb
2013-12-05 Miguel de Dios <miguel.dedios@artica.es>
...
* src/pandroid_event_viewer/pandorafms/API.java: fixed the offset
parameter for the api.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9165 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-12-05 10:32:55 +00:00
mdtrooper
f88a335a14
2013-12-04 Miguel de Dios <miguel.dedios@artica.es>
...
* src/pandroid_event_viewer/pandorafms/EventList.java,
src/pandroid_event_viewer/pandorafms/Main.java: fixed java
warnings.
* src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java:
fixed the hack for old pandoras.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9162 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-12-04 16:50:05 +00:00