hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-15 05:53:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,516 Commits 268 Branches 107 Tags
f4428d2ff468f10c4d9b51f82bb8745ec737b6e8
Commit Graph

266 Commits

Author SHA1 Message Date
Romain Neutron
fafe2dca0f Fix latest merge 2013-10-25 13:47:35 +02:00
Romain Neutron
762f758705 Merge branch '3.8' 
Conflicts:
	bower.json
	lib/Alchemy/Phrasea/Controller/Prod/Feed.php
	lib/classes/Feed/Entry/Adapter.php
	lib/classes/Feed/Entry/Item.php
	lib/classes/eventsmanager/notify/feed.php
	tests/classes/Feed/Entry/Feed_Entry_ItemTest.php
 2013-10-24 14:05:04 +02:00
Nicolas Le Goff
66facbabea Add Bootstrap Carousel & Galleria as homepage presentation mode 2013-10-22 11:27:40 +02:00
Romain Neutron
f7dfe893b4 Merge branch '3.8' 
Conflicts:
	bower.json
 2013-10-15 19:11:39 +02:00
Nicolas Le Goff
d4b7280c81 Fix #1522 Issue with jquery ui tabs & multiselect 2013-10-10 16:20:20 +02:00
Romain Neutron
7e8a34c599 Merge branch '3.8' 
Conflicts:
	bin/developer
	build-env.sh
	composer.json
	composer.lock
 2013-10-10 13:42:42 +02:00
Romain Neutron
41306fec74 Update defautl configurations 2013-10-09 12:16:43 +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
Nicolas Le Goff
d7c720ed7d Fix #1501 increase usr_login column size 2013-10-02 17:33:26 +02:00
Romain Neutron
d00b39fec8 Merge branch '3.8' 2013-09-24 12:43:00 +02:00
Romain Neutron
72bfbd83e8 Remove doctrine tables from drop advices 2013-09-24 11:03:41 +02:00
Romain Neutron
b96c7e8622 Remove chrome frame toggler 2013-09-23 14:11:58 +02:00
Romain Neutron
6c7c196a20 Add Office Plugin client id and secret 2013-09-14 02:10:11 +02:00
Romain Neutron
d2947d8fbc Enable navigator by default 2013-09-14 02:08:51 +02:00
Romain Neutron
f955163edb Merge branch '3.7' into 3.8 
Conflicts:
	lib/Alchemy/Phrasea/Application/Api.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/conf.d/_GV_template.inc
 2013-09-14 02:02:56 +02:00
Romain Neutron
871fa40553 Add Office Plugin client id and secret 2013-09-09 13:31:31 +02:00
Romain Neutron
a0dba36e67 Enable navigator by default 2013-09-09 13:05:55 +02:00
Andrey
f8c4041733 Removed yaml files 2013-09-05 13:44:08 +02:00
Andrey
92f2ceb756 Removed extra tables from xml conf 2013-09-05 13:44:07 +02:00
Andrey
c8b62c02db Rebased, fixed codestyle 2013-09-05 13:44:06 +02:00
Andrey
84300f3c92 Replaced remaining occurrences of Feed_ classes, updated tests 2013-09-05 13:44:04 +02:00
Andrey
bc5b69fae4 Fixed codestyle 2013-09-05 13:44:03 +02:00
Andrey
1d7c60ac41 Add token entities dcm files 2013-09-05 13:43:04 +02:00
Romain Neutron
b6a8a90197 Fix CS 2013-09-04 12:14:52 +02:00
Romain Neutron
7f92a2546a Remove ftp entities 2013-08-30 18:35:21 +02:00
Nicolas Le Goff
33b0648ce5 Update SQLite database reference 2013-08-27 00:30:03 +02:00
Nicolas Le Goff
6a8312ca64 Add FtpCredentials entity 2013-08-23 12:09:50 +02:00
Nicolas Le Goff
01602a49f1 Add json2 2013-08-17 17:12:58 +02:00
Nicolas Le Goff
89b57730b5 Add swfobject 2013-08-17 17:12:58 +02:00
Nicolas Le Goff
7d8e93bddd Fix assets path 2013-08-17 17:12:57 +02:00
Nicolas Le Goff
74fc121fb6 Add grunt build-assets task 2013-08-17 17:12:57 +02:00
Romain Neutron
5ce2ec5da8 Merge branch '3.8' 2013-08-08 16:46:36 +02:00
Romain Neutron
f07ace58bc Add plugins reset command 2013-08-08 15:35:46 +02:00
Romain Neutron
2be961e28c Merge branch '3.8' 2013-08-08 11:06:59 +02:00
Nicolas Le Goff
92282dd0d4 Fix #1412 Set defaut gender to empty value 2013-08-07 19:35:33 +02:00
Nicolas Le Goff
3bb0725985 Fix #1385 Can not install Phraseanet 2013-08-07 14:23:30 +02:00
Andrey
4c5ed2b153 Removed .yml files, added filecachereader 2013-08-05 18:18:26 +02:00
Nicolas Le Goff
75ad5716e8 Fix #1385 Can not install Phraseanet 2013-08-05 14:53:25 +02:00
Romain Neutron
1edc1a4a6a Remove deprecated code 2013-07-23 17:20:23 +02:00
Romain Neutron
0ab927ec97 Fix #1243 Phraseanet enabled languages is now configurable 2013-07-17 21:22:01 +02:00
Romain Neutron
6d8af80dee Fix #1347 : Export dialog box does not open in lightbox 2013-07-17 11:55:34 +02:00
Nicolas Le Goff
5b0bc8b284 Add recess binary 
Set recess binary to config
 2013-07-12 20:06:32 +02:00
Romain Neutron
25d5a25e83 Add unique key constraint on sbas_id / server_coll_id 2013-07-12 15:38:51 +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
d9b72e662b Update default configuration 2013-07-10 15:56:21 +02:00
Romain Neutron
c1347618ac Fix #1240 : Remove authentication>auto-create>enabled parameter 2013-07-10 14:02:29 +02:00
Romain Neutron
70cb9ee06b Fix #1245 : Rename trials-before-failure configuration to trials-before-display 2013-07-10 12:53:47 +02:00
Romain Neutron
003db6df05 Update geonames server address 2013-07-09 14:10:18 +02:00
Romain Neutron
81c5411212 Merge pull request #455 from nlegoff/geonames_plugin 
[3.8] Geonames jquery plugin integration
 2013-07-04 06:12:36 -07:00
Nicolas Le Goff
3034ce1d78 Add city retrieval from geonamed id on input creation 2013-07-04 14:20:23 +02:00