hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,470 Commits 268 Branches 107 Tags
93394ae9275d1f3e92fba11a2c83a41e230fc766
Commit Graph

155 Commits

Author SHA1 Message Date
Harrys Ravalomanana
7a88ece5fe PHRAS-2829 2019-11-25 17:45:29 +04:00
Nicolas Maillat
a9ed349f86 Merge branch 'master' into PHRAS-2829_Port41_Lightbox-mobile-users-choice-and-validation-report 2019-11-22 15:21:00 +01:00
Nicolas Maillat
2e10a1121a Merge branch 'master' into dependabot/npm_and_yarn/fstream-1.0.12 2019-11-20 19:27:45 +01:00
Nicolas Maillat
2f1e247392 Merge branch 'master' into dependabot/npm_and_yarn/fstream-1.0.12 2019-11-20 10:21:48 +01:00
Nicolas Maillat
2042ab0e33 Merge branch 'master' into dependabot/npm_and_yarn/mixin-deep-1.3.2 2019-11-20 10:21:30 +01:00
Harrys Ravalomanana
0d1a354b47 PHRAS-2805 #comment upgrade phraseanet-production-client 2019-11-20 11:57:29 +04:00
Harrys Ravalomanana
f025745170 PHRAS-2829 #comment add translation and upgrade phraseanet-production-client 2019-11-19 11:52:40 +04:00
Nicolas Maillat
8e428fadad Merge branch 'master' into dependabot/npm_and_yarn/fstream-1.0.12 2019-11-13 18:46:31 +01:00
Nicolas Maillat
078cf31072 Merge branch 'master' into dependabot/npm_and_yarn/mixin-deep-1.3.2 2019-11-13 18:46:12 +01:00
Nicolas Maillat
ca34750d06 Merge branch 'master' into dependabot/npm_and_yarn/fstream-1.0.12 2019-11-13 10:25:04 +01:00
Nicolas Maillat
a05810f109 Merge branch 'master' into dependabot/npm_and_yarn/mixin-deep-1.3.2 2019-11-13 10:24:51 +01:00
dependabot[bot]
1260e87d8b Bump lodash.merge from 4.6.1 to 4.6.2 
Bumps [lodash.merge](https://github.com/lodash/lodash) from 4.6.1 to 4.6.2.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-11-12 13:20:08 +00:00
Nicolas Maillat
c1b1ed0fab Merge branch 'master' into kubernetes_ready 2019-11-08 17:49:04 +01:00
dependabot[bot]
358a3cd332 Bump mixin-deep from 1.3.1 to 1.3.2 
Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/jonschlinkert/mixin-deep/releases)
- [Commits](https://github.com/jonschlinkert/mixin-deep/compare/1.3.1...1.3.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-11-08 13:42:27 +00:00
dependabot[bot]
58c047a680 Bump fstream from 1.0.11 to 1.0.12 
Bumps [fstream](https://github.com/npm/fstream) from 1.0.11 to 1.0.12.
- [Release notes](https://github.com/npm/fstream/releases)
- [Commits](https://github.com/npm/fstream/compare/v1.0.11...v1.0.12)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-11-08 13:42:26 +00:00
Harrys Ravalomanana
deb7f70a52 PHRAS-2792 #comment upgrade phraseanet-production-client@0.34.76-d 2019-11-08 15:14:21 +04:00
Nicolas Maillat
8f6d175a98 Merge branch 'master' into kubernetes_ready 2019-11-05 17:16:43 +01:00
Harrys Ravalomanana
c1c76a6d9e PHRAS-2792 #comment upgrade phraseanet-production-client 2019-11-04 13:53:57 +04:00
Alexandre BRACH
ccef7b11dc kubernetes #comment add yarn in the fpm/worker images 2019-10-18 16:49:01 +02:00
Harrys Ravalomanana
d202fe5980 PHRAS-2686 upgrade phraseanet-production-client 2019-09-20 15:20:58 +04:00
Harrys Ravalomanana
0212619314 PHRAS-2282 #comment upgrade phraseanet-production-client@0.34.63-d #time 2h 2019-09-10 14:03:51 +04:00
Harrys Ravalomanana
29cac8af1f PHRAS-2656 update package.json for the fix 2019-07-09 16:04:04 +04:00
Harrys Ravalomanana
dbf653badf PHRAS-2455 #comment upgrade phraseanet-production-client to 0.34.52-d 2019-07-05 17:18:12 +04:00
Harrys Ravalomanana
529dbf9783 PHRAS-2544 #comment upgrade phraseanet-production-client@0.34.41-d 2019-06-27 14:13:13 +04:00
Harrys Ravalomanana
53d8615c59 PHRAS-2623 #comment update composer.json and package.lock on phraseanet 2019-06-20 17:52:42 +04:00
Harrys Ravalomanana
76cbee1bd4 PHRAS-2622 #comment update on stable version phraseanet-production-client@0.34.31-d 2019-06-14 14:07:58 +04:00
Harrys Ravalomanana
48bd30ab9a PHRAS-2376 #comment update yarn.lock 2019-06-04 13:09:45 +04:00
Harrys Ravalomanana
674fe1d817 PHRAS-2574 #comment update phraseanet-production-client version to 0.34.15-d #time 0.5 2019-05-31 16:43:29 +04:00
Harrys Ravalomanana
f9a82d6b41 PHRAS-2419 #comment update phraseanet-production-version to 0.354.12-d #time 15m 2019-05-24 15:37:39 +04:00
Harrys Ravalomanana
0e150f07a5 PHRAS-2552_embed_bundle_update_workflow 2019-05-14 16:46:37 +04:00
Harrys Ravalomanana
5e1cce59df PHRAS-2552_Videojs_embed_bundle_set_reading_head_position_at_specific_time 2019-05-14 14:42:48 +04:00
Harrys Ravalomanana
68e4b2542d PHRAS-2551-Advance_search-search_on_date_field_NOK_when_selected_field_is_reset update phraseanet-production-client version 2019-05-07 15:07:03 +04:00
Harrys Ravalomanana
5e5f5e34cb PHRAS-2430 update phraseanet-production-client@0.34.7 2019-04-30 13:50:01 +04:00
Harrys Ravalomanana
2390244e9e Merge branch master into PHRAS-2430 2019-04-05 15:11:09 +04:00
Kamlesh Balloo
c5e95b7e44 PHRAS-2430-update-phraseanet-production-version-for-restore-query 2019-04-01 14:55:04 +04:00
Arthur de Moulins
25aeb9d73a PHRAS-2494 keep node_modules directory for performance 2019-03-27 17:23:44 +01:00
Harrys
f6fb898ec5 PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query 2019-03-21 17:49:40 +04:00
Harrys
41e847256a PHRAS-2430 Port to 4.1 - Advance search refacto , Restore Query and a little Polish 2019-03-20 16:03:13 +04:00
Harrys
87c8433f0f PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query 2019-03-19 18:08:44 +04:00
Harrys
8d34e4a7d8 PHRAS-2464_downgrade_Phraseanet-production-client_to_0_33_84 2019-03-01 17:22:19 +04:00
Harrys
28de65edb9 PHRAS-2464_downgrade_Phraseanet-production-client_to_0_33_84 update yarn.lock 2019-03-01 17:13:56 +04:00
jygaulier
b8bebbce11 PHRAS-2189 report v2 master (#2742) 
move code to services
added "download" report
change services to factory
added excel lib
added prod/report routes (download)
cleanup api routes
add : allow anonymized (user, fonction, societe... are "-")
removed : xls support (memory eating lib) in favor of xlsx
add : report download only on "document" and "preview" subdef classes
cs : report factory
add : restored "site" filter (see todos in src)
remove debug, cs

todo : doc
 2018-11-12 19:43:40 +01:00
Mike Ng
bc103637cd wip - refactor ui of push screen 2018-06-14 17:25:38 +04:00
mike-esokia
be0969a8cb add back requirejs 2018-05-08 13:44:34 +04:00
mike-esokia
43e5f89d2e fix jquery-mobile and mobile layout for lightbox 2018-05-08 13:39:22 +04:00
Nicolas Maillat
fd54f938ef Merge pull request #2543 from mike-esokia/PHRAS-1935_refacto_prod_video_editor 
PHRAS-1935 import roboto fonts via font.googleapis
 2018-04-06 16:03:53 +02:00
Mike Ng
ae2839f441 update yarn.lock 2018-04-06 16:39:35 +04:00
aina-esokia
dab28e44eb use yarn in package.json scripts section 2018-03-26 15:56:53 +04:00
Mike Ng
abc0fc392b refactor layout of facet preferences 2018-03-13 10:33:53 +04:00
Mike Ng
f95e40f0b8 Port PHRAS-1381 to 4.1 2018-03-08 13:02:07 +04:00