Merge branch 'macclane' into spartan (6d236b46) · Commits · open-source / oscar

.gitignore

+3 −0

Changes for .gitignore: 3 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -29,6 +29,9 @@ public/js/oscar/dist/index.html
		public/js/oscar/dist/client.css
		public/js/oscar/dist/client.css.map

		# VUE CLI
		public/js/oscar/dist/demo.html

		doc/*.html

		# Connecteurs

+1255 −550

File changed.

Preview size limit exceeded, changes collapsed.

+0 −3

Changes for config/autoload/global.php: 0 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -228,9 +228,6 @@ return array(
		'timesheet_modele' => realpath(__DIR__.'/../../data/timesheet_model.xls'),
		],

		'log_path' => __DIR__ . '/../../logs/oscar.log',
		'log_level' => \Monolog\Logger::WARNING,

		'generated-documents' => [
		'activity' => []
		],

+10 −2

Changes for doc/config-elasticsearch.md: 10 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -28,6 +28,14 @@ return array(

		> la clef `params` prend bien pour valeur un tableau, contenant un tableau de chaîne avec la liste des noeuds Elastic Search disponibles, dans notre cas il n'y a qu'un seul et unique noeud.

		Vous pouvez reconstruire manuellement l'index de recherche avec la commande :

		```bash
		# Reconstruction de l'index de recherche
		php bin/oscar.php activity:search-rebuild
		```



		## Recherche des personnes

		@@ -59,7 +67,7 @@ return array(

		```bash
		# Reconstruction de l'index de recherche
		php pubic/index.php oscar persons:search:build
		php bin/oscar.php persons:search-rebuild
		```

		## Recherche des organisations
		@@ -92,6 +100,6 @@ return array(

		```bash
		# Reconstruction de l'index de recherche
		php public/index.php oscar organizations:search:build
		php bin/oscar.php organizations:search-rebuild
		```

+1 −1

Changes for doc/config-gearman.md: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -71,7 +71,7 @@ cd /etc/systemd/system
		ln -s /var/OscarApp/oscar/config/oscarworker.service oscarworker.service

		# On active le service
		systemctl status oscarworker.service
		systemctl enable oscarworker.service
		# Ancienne syntaxe avec SYSTEM : service enable oscarworker