hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-08 10:34:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,852 Commits 268 Branches 107 Tags
cae61dfe1e6862a5788aad7543a658dea47b263a
Commit Graph

291 Commits

Author SHA1 Message Date
Romain Neutron
8663f49228 Merge branch '3.8' 
Conflicts:
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Core/Version.php
 2013-11-20 15:53:50 +01:00
Romain Neutron
be0815a9e0 Fix typo 2013-11-20 12:48:29 +01:00
Romain Neutron
7e0a3c7338 Use configuration property accessor 2013-11-18 18:48:27 +01:00
Romain Neutron
56b373ee6e Use short array declaration 2013-11-18 13:57:33 +01:00
Romain Neutron
d40b1d4fb1 Fix CS 2013-11-18 13:07:40 +01:00
Romain Neutron
13915dc1a8 Rename "phraseanet.configuration" service to "configuration" 2013-11-15 22:08:07 +01:00
Romain Neutron
f39af8b64e Merge branch '3.8' 2013-11-06 11:26:47 +01:00
Nicolas Le Goff
1fdf30c6af Use ACL service provider to get user's ACL 2013-11-05 12:21:42 +01:00
jygaulier
1f5e4da841 added tests for "phrasea_public_query" and "phrasea_highlight" in console/checkExtension 2013-11-04 19:36:29 +01:00
Romain Neutron
afd9d33b9a Update task manager commands 2013-10-29 18:46:34 +01:00
Romain Neutron
5ceaa35717 Fix latest merge 2013-10-03 16:41:59 +02:00
Romain Neutron
1dfbff5666 Merge branch '3.8' 
Conflicts:
	CHANGELOG.md
	bin/developer
	lib/classes/module/console/systemUpgrade.php
	www/skins/report/jquery-ui.css
 2013-10-03 15:29:22 +02:00
Romain Neutron
642a1a5657 Fix CS 2013-10-03 15:24:15 +02:00
Romain Neutron
abae32ca5f Fix #1489 : Let errors happen when they occur 2013-10-02 18:30:48 +02:00
Romain Neutron
eb590780ca Fix CS 2013-09-30 18:26:32 +02:00
Romain Neutron
0b9c8b64ac Merge branch '3.8' 2013-09-19 14:53:55 +02:00
Romain Neutron
b9a0b9c12c Fix serialization 2013-09-18 23:36:19 +02:00
Romain Neutron
45c5276923 Merge branch '3.8' 2013-09-18 12:09:20 +02:00
Romain Neutron
756f6095a7 Minor report updates 2013-09-18 12:07:07 +02:00
Romain Neutron
6c29fc88e9 Merge branch '3.8' 
Conflicts:
	composer.lock
	templates/mobile/common/index.html.twig
 2013-09-05 13:57:42 +02:00
Romain Neutron
ba980d5f34 Fix tmp directories cleanup 2013-09-04 17:14:53 +02:00
Romain Neutron
dbd06e9091 Remove dead code 2013-09-04 12:14:50 +02:00
Romain Neutron
c8d415c562 Merge branch '3.8' 2013-09-02 17:22:18 +02:00
Romain Neutron
2192afc702 Fix #1422 : logfiles contain duplicates log messages 2013-09-02 12:33:34 +02:00
Romain Neutron
447cb60327 Fix CS 2013-08-30 13:48:13 +02:00
Nicolas Le Goff
34b4fdde74 Remove get_wrong_email_users() from User_Adapter 2013-08-26 17:48:51 +02:00
Romain Neutron
80f816935d Fix #1270 : Update XML field after having rename a databox documentation structure field 2013-07-23 12:14:07 +02:00
Romain Neutron
899549d45a Fix #1242 : Commands description check, move generate:template command to developer console 2013-07-17 20:14:23 +02:00
Romain Neutron
daf5cc077d Fix command option 2013-07-11 11:55:41 +02:00
Romain Neutron
9c531b9466 Merge pull request #476 from romainneutron/fix_07-10 
[3.8] Multiple fixes
 2013-07-10 09:19:48 -07:00
Romain Neutron
0f5dc461e6 Fix typo 2013-07-10 15:56:20 +02:00
Romain Neutron
bb62b43494 Fix #1262 : Add timeout on backup db process 2013-07-10 12:42:23 +02:00
Romain Neutron
ce34bca408 Add second logging channel 2013-07-01 14:38:17 +02:00
Romain Neutron
24f6f19731 Remove duplicate verbosity check 2013-07-01 14:36:29 +02:00
Romain Neutron
94ed0a90e4 Merge pull request #423 from nlegoff/jquery_ui_1.10.3 
[3.8] Update jquery-ui 1.8 to 1.10.*
 2013-06-24 10:49:48 -07:00
Nicolas Le Goff
764fa42f14 Update to jquery ui 1.10.3 
Fix conflict & ui bugs

Remove debug
 2013-06-21 13:46:16 +02:00
Romain Neutron
3f47cc248d Remove registry's GV_RootPath calls 2013-06-19 19:25:16 +02:00
Romain Neutron
af9307b148 Add sessions patch 2013-06-18 15:37:19 +02:00
Romain Neutron
241705a568 Merge pull request #399 from romainneutron/ip-proxies 
[3.8] Add trusted proxies configuration
 2013-06-17 10:28:49 -07:00
Romain Neutron
42db38d055 Add error pages, fix error handling and PHP conf 2013-06-17 17:01:35 +02:00
Romain Neutron
247b49668e Add bzip2/gzip option for DBs backup 2013-06-17 12:31:27 +02:00
Romain Neutron
f9b4978569 Merge pull request #390 from romainneutron/databox-labels 
[3.8] Add labels to databoxes
 2013-06-13 07:41:05 -07:00
Romain Neutron
11a55bbd43 Add labels to databoxes 2013-06-13 09:45:43 +02:00
Nicolas Le Goff
c663d9d82d Fix #1101 Add sended record throught mail in report 
Fix typo
 2013-06-12 16:57:11 +02:00
Romain Neutron
32c2d6154a Remove phraseanet services, update configuration 2013-06-11 14:05:44 +02:00
Romain Neutron
c084f20f85 Labelize collections 2013-06-01 01:29:07 +02:00
Romain Neutron
4d81c5f8d8 Remove autoloader 2013-05-30 20:15:08 +02:00
Romain Neutron
6537b96f4c Add AuthenticationServiceProvider 2013-05-29 14:22:50 +02:00
Romain Neutron
9285536d0d Fix install 2013-05-23 18:52:41 +02:00
Romain Neutron
5a80e9dc22 Introduce configuration-tester 2013-05-13 15:07:47 +02:00