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

6516 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Le Goff
af2fdc1eac Fix1539 2013-10-16 19:09:20 +02:00
Romain Neutron
1b6dd391f8 Fix feeds upgrade 2013-10-16 10:36:59 +02:00
Romain Neutron
f7dfe893b4 Merge branch '3.8' 
Conflicts:
	bower.json
 2013-10-15 19:11:39 +02:00
Romain Neutron
cc75ef5ac6 Merge pull request #698 from nlegoff/fix_login_css 
[3.8] Enhance CSS for homepage customization
 2013-10-15 09:57:06 -07:00
Romain Neutron
3e03343825 Merge pull request #692 from nlegoff/fix1522 
[3.8] Fix #1522 issue with jquery ui & multiselect plugin in report
 2013-10-15 09:56:40 -07:00
Nicolas Le Goff
1d04c418cd Remove jquery multiselect plugin 2013-10-15 15:06:52 +02:00
Nicolas Le Goff
358ef398a5 Enhance login css 2013-10-15 15:02:02 +02:00
Romain Neutron
989c1b80e8 Merge pull request #689 from romainneutron/fix-1528 
[3.8] Fix #1528 : Allow collection order only on available collections
 2013-10-15 05:57:36 -07:00
Romain Neutron
e5989c70b0 Update changelog 2013-10-15 14:56:55 +02:00
Romain Neutron
7618106667 Fix ORM patches 2013-10-15 14:38:17 +02:00
Romain Neutron
92fe657e80 Fix #1528 : Restrict collection ordering on available collections 2013-10-15 14:14:44 +02:00
Romain Neutron
b7d8f777fd Merge pull request #694 from romainneutron/fix-1535 
[3.8] Fix #1535 : API does not display search engine suggestions correctly
 2013-10-15 04:05:30 -07:00
jygaulier
f32d561c98 fix #1496 2013-10-14 16:58:32 +02:00
Romain Neutron
1551d03f95 Merge pull request #686 from romainneutron/fix-1527 
[3.8] Fix #1527 : Wrong offset for classic query result
 2013-10-10 09:09:43 -07:00
Romain Neutron
457b5ef3f0 Merge pull request #693 from nlegoff/fix1518 
[3.8] Fix #1518 Can not edit tags in metadatas settings
 2013-10-10 09:07:00 -07:00
Romain Neutron
eca23ce8c1 Merge pull request #688 from romainneutron/fix-1520 
[3.8] Fix #1520 : Avoid fatal error while editing from multiple databoxes
 2013-10-10 09:03:04 -07:00
Romain Neutron
32005914e2 Merge pull request #687 from romainneutron/fix-1524 
[3.8] Fix #1524 : API search query is discarded with GET method
 2013-10-10 09:02:42 -07:00
Romain Neutron
eb6eb689e0 Fix #1535 : API does not display search engine suggestions correctly 2013-10-10 18:00:09 +02:00
Nicolas Le Goff
bb836ad360 Fix #1518 Can not edit tags in metadatas settings 2013-10-10 16:45:19 +02:00
Nicolas Le Goff
d4b7280c81 Fix #1522 Issue with jquery ui tabs & multiselect 2013-10-10 16:20:20 +02:00
Romain Neutron
e92a8459b2 Merge pull request #690 from romainneutron/fix-1488 
[3.8] Fix #1488 : Push / Feedback name is now mandatory
 2013-10-10 07:15:21 -07: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
9e916a8fcc Fix #1527 : Wrong offset for classic query result 2013-10-10 13:40:10 +02:00
Romain Neutron
e87aa5afb3 Fix #1524 : API search query is discarded with GET method 2013-10-10 13:39:59 +02:00
Romain Neutron
5538a6924c Fix #1520 : Avoid fatal error while editing from multiple databoxes 2013-10-10 13:39:47 +02:00
Romain Neutron
f648ea296f Fix #1488 : Push / Feedback name is now mandatory 2013-10-10 13:39:07 +02:00
Romain Neutron
d296237154 Merge pull request #691 from romainneutron/fix-dependencies 
[3.8] Update dependencies, fix travis build
 2013-10-10 04:38:26 -07:00
Romain Neutron
972a68e847 Update dependencies, fix travis build 2013-10-10 11:44:05 +02:00
Romain Neutron
044a7d5862 Merge pull request #685 from romainneutron/icc-profiles 
[3.8] Fix ICC profiles management
 2013-10-09 04:13:52 -07:00
Romain Neutron
5996e590bc Reset exiftool writer before writing 2013-10-09 12:18:16 +02:00
Romain Neutron
41306fec74 Update defautl configurations 2013-10-09 12:16:43 +02:00
Romain Neutron
93a675c916 Merge pull request #684 from nlegoff/modif_homepage 
[3.8] Enhance code for homepage customization
 2013-10-07 23:44:26 -07:00
Romain Neutron
097e1f21ae Remove calls to dropped orders table 2013-10-07 18:36:52 +02:00
Romain Neutron
b7773a44ef Drop ftp_export tables calls 2013-10-07 15:42:10 +02:00
Nicolas Le Goff
849f6ca8ff Fix css issue on phone devices 2013-10-07 15:22:00 +02:00
Romain Neutron
5dde57b466 Fix latest merges 2013-10-07 15:06:59 +02:00
Nicolas Le Goff
cde7d30a6b Sets language button text color as global text color 2013-10-07 14:26:52 +02:00
Nicolas Le Goff
2d632b335c Add a new 'container' block 2013-10-07 14:26:51 +02:00
Nicolas Le Goff
daa7a9be58 Remove bold balise from template 2013-10-07 14:26:51 +02:00
Nicolas Le Goff
2b7ecdd0a0 Add Phraseanet namespace for twig templates 2013-10-07 14:26:50 +02:00
Romain Neutron
6345fcc83a Add uninstaller for development purposes 2013-10-07 10:08:11 +02:00
Romain Neutron
cafb588e8d Merge pull request #683 from romainneutron/uninstaller 
[3.8] Add uninstaller for development purposes
 2013-10-04 09:04:24 -07:00
Romain Neutron
0a950b0ae6 Add uninstaller for development purposes 2013-10-04 17:29:13 +02:00
Romain Neutron
8af5b3f610 Fix master unit tests 2013-10-04 17:13:24 +02:00
Romain Neutron
d716e91169 Merge branch '3.8' 
Conflicts:
	composer.lock
 2013-10-04 15:15:04 +02:00
Romain Neutron
1d780c4f3e Merge pull request #682 from romainneutron/build-install 
[3.8] Add install and update travis environments
 2013-10-04 06:08:56 -07:00
Romain Neutron
3b5c9ffcb5 Fix unit tests on fresh install 2013-10-04 14:40:14 +02:00
Romain Neutron
d99eb54b6c Add install and update travis environments 2013-10-04 14:40:13 +02:00
Romain Neutron
06a657cba6 Merge pull request #681 from nlegoff/api_auth_fix 
[3.8] Fix API authentification
 2013-10-04 03:15:58 -07:00
Nicolas Le Goff
9fc8fbc194 Fix API password grant type authentication 2013-10-03 17:12:46 +02:00