hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-13 04:53:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,716 Commits 268 Branches 107 Tags
1be9d11f9608d505d39e65bcd65a567a47a12a9c
Commit Graph

2716 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Neutron
6a4708bee5 Add debug line 2012-04-20 11:13:13 +02:00
Romain Neutron
a9e328c513 Fix merge 2012-04-20 11:12:50 +02:00
Romain Neutron
c5859e25eb Merge branch 'Fix' into Dev 2012-04-20 10:58:35 +02:00
Romain Neutron
01af439f3a Fix webkit selection 2012-04-20 10:57:21 +02:00
Romain Neutron
098b57389c Merge with master 2012-04-19 11:17:28 +02:00
Romain Neutron
18707146b7 Subdef export does not include original file extension anymore 2012-04-19 11:05:33 +02:00
Romain Neutron
8765328811 Fix display in small screen 2012-04-19 10:46:22 +02:00
Romain Neutron
82c4474f55 Fix databox cache update 2012-04-19 10:41:34 +02:00
Romain Neutron
f779bddc99 Merge with master 2012-04-18 14:00:27 +02:00
Romain Neutron
4b7f6175e7 Fix bug meta merging 2012-04-18 13:39:50 +02:00
Romain Neutron
322df354b4 Merge with master 2012-04-18 12:42:38 +02:00
Romain Neutron
80e777658e Fix labels with thesaurus links 2012-04-18 12:24:13 +02:00
Romain Neutron
f2a649ba4b Bump to version 3.6.2 3.6.2 2012-04-18 11:54:18 +02:00
Romain Neutron
c1e6c19959 Merge branch 'Fix' into Dev 2012-04-18 11:53:19 +02:00
Romain Neutron
ce98f73f8f Fix #584 : some selection are returned as object instead of array 2012-04-18 11:45:46 +02:00
Jonathan SCHNEIDER
72003322e5 Merge branch 'Dev' of https://github.com/alchemy-fr/Phraseanet into Dev 2012-04-17 19:30:33 +02:00
Jonathan SCHNEIDER
ae0d650571 add vendors for windows system 2012-04-17 19:29:58 +02:00
Romain Neutron
332d67069d 3.7 routes 2012-04-17 13:41:14 +02:00
Jonathan SCHNEIDER
dbb81b3f97 Add vendor for windows (experimental) 2012-04-16 19:28:19 +02:00
Romain Neutron
abd4a30885 Fix CS 2012-04-16 10:00:12 +02:00
Romain Neutron
cc42055f4d Fix CS 2012-04-14 12:18:29 +02:00
Romain Neutron
855fd91081 Move tests at root 2012-04-14 12:07:49 +02:00
Romain Neutron
855bb0d635 Move tests at root 2012-04-14 11:58:51 +02:00
Romain Neutron
8025622378 Move tests at root 2012-04-14 11:57:28 +02:00
Romain Neutron
c427ee5960 Fix unit tests 2012-04-14 02:28:51 +02:00
Romain Neutron
450c789cef Fix annotations 2012-04-13 19:12:26 +02:00
Romain Neutron
8b03568108 Fix installer 2012-04-13 17:45:09 +02:00
Romain Neutron
8d5f713ef8 Merge branch 'Dev' of github.com:alchemy-fr/Phraseanet into Dev 2012-04-13 16:34:36 +02:00
Romain Neutron
6e77e78eca Merge branch 'master' of github.com:alchemy-fr/Phraseanet into Dev 2012-04-13 16:34:08 +02:00
Romain Neutron
adddfa18c3 Fix template generator 2012-04-13 16:33:51 +02:00
Nicolas Le Goff
b3d37ca7b0 Merge branch 'fix_native_auth' into Dev 2012-04-13 15:50:02 +02:00
Nicolas Le Goff
636f6dc21d fix native auth flow 2012-04-13 15:47:29 +02:00
Nicolas Le Goff
527b3639b5 implements oauth2.0 v9.0 Resource Owner Basic Credentials 2012-04-13 15:44:39 +02:00
Nicolas Le Goff
acbf06f565 add raw filter for cgus 2012-04-12 19:25:07 +02:00
Nicolas Le Goff
e513a75d86 delete chgthumb, newimg, rotate, img function, chgdocument files 2012-04-12 17:50:13 +02:00
Nicolas Le Goff
f49f816e48 Merge branch 'Dev' of github.com:alchemy-fr/Phraseanet into tools_refactor 2012-04-12 17:39:27 +02:00
Nicolas Le Goff
e723ccf9f8 fix typo 2012-04-12 17:34:15 +02:00
Nicolas Le Goff
a4c5141dfd add thumb extractor routes ( apply new thumbnail & confirm box) 2012-04-12 17:33:30 +02:00
Nicolas Le Goff
9f8adfe2e9 add data-uri dependency 2012-04-12 17:32:08 +02:00
Nicolas Le Goff
1783e46f8e add thumb extractor css 2012-04-12 17:31:38 +02:00
Nicolas Le Goff
4365f1ef27 add thumb extractor icons 2012-04-12 17:31:15 +02:00
Nicolas Le Goff
de6c492c4f add thumb extractor library 2012-04-12 17:30:46 +02:00
Nicolas Le Goff
d6558b33ba add pixastic and thumbExtractor to prod application 2012-04-12 17:30:33 +02:00
Nicolas Le Goff
09a6a2ee3c add pixastic js library 2012-04-12 17:29:39 +02:00
Nicolas Le Goff
29ab98b9c7 update tool box templates 2012-04-12 17:28:49 +02:00
Romain Neutron
45a4af8f1b Merge branch 'FixServerName' into Dev 2012-04-11 14:58:17 +02:00
Romain Neutron
6d57972c1e Fix order master selection 2012-04-11 14:44:58 +02:00
Romain Neutron
a6ffc4f3ec Fix ServerName load 2012-04-11 14:35:56 +02:00
Nicolas Le Goff
4fba8f1418 fix typo issue 2012-04-10 15:07:15 +02:00
Romain Neutron
c3d66f574d Merge branch 'FixBasketSort' into Dev 2012-04-10 14:09:23 +02:00