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
11,970 Commits 268 Branches 107 Tags
ea53da9086c867d5c1e7cd0729775343f42acb63
Commit Graph

1959 Commits

Author SHA1 Message Date
falylala
ea53da9086 Show all available structure for install CLI/Graphic mode 2017-11-20 12:16:54 +04:00
Nicolas Maillat
689505928a Merge pull request #2231 from mike-esokia/PHRAS-1524_Port_PHRAS-1475_and_PHRAS-1498 
PHRAS-1524 port PHRAS-1475 and PHRAS-1498
 2017-11-16 13:40:51 +01:00
Nicolas Maillat
6c04aa6b94 Merge pull request #2368 from mike-esokia/PHRAS-1532_PORT_PHRAS-1487 
PHRAS-1532 PORT PHRAS-1487
 2017-11-16 10:29:56 +01:00
Nicolas Maillat
43c5277851 Merge pull request #2365 from mike-esokia/PHRAS-1528_PORT_PHRAS-1433 
PHRAS-1528 PORT PHRAS-1433
 2017-11-16 10:28:35 +01:00
Nicolas Maillat
cc52dbdaa9 Merge pull request #2364 from mike-esokia/PHRAS-1527_PORT_PHRAS-1414 
PHRAS-1527 PORT PHRAS-1414
 2017-11-16 10:28:15 +01:00
Nicolas Maillat
dfde06a293 Merge pull request #2363 from mike-esokia/PHRAS-1526_fix_event_button_print_export 
PHRAS-1526 fix event listener for button export / download
 2017-11-16 10:11:33 +01:00
Nicolas Maillat
2f722dfc6a Merge pull request #2366 from mike-esokia/PHRAS-1529_PORT_PHRAS-1415 
PHRAS-1529 PORT PHRAS-1415
 2017-11-15 15:48:03 +01:00
Nicolas Maillat
acc674be43 Merge pull request #2362 from mike-esokia/PHRAS-1525_port_PHRAS-1434_1435_1436_1437_1457 
PHRAS-1525 port phras 1434 1435 1436 1437 1457
 2017-11-15 13:43:05 +01:00
Mike Ng
8f8d9bb706 Merge branch 'master-alchemy' into PHRAS-1525_port_PHRAS-1434_1435_1436_1437_1457 2017-11-15 11:23:51 +04:00
Mike Ng
7932d632db Merge branch 'master-alchemy' into PHRAS-1524_Port_PHRAS-1475_and_PHRAS-1498 2017-11-15 09:45:18 +04:00
Mike Ng
55aabea716 Merge branch 'master-alchemy' into PHRAS-1520_PORT_PHRAS-1464_1482_1483_1492_1496 2017-11-15 09:42:40 +04:00
Nicolas Maillat
43a629169a Merge pull request #2227 from mike-esokia/PHRAS-1516_port_PHRAS-1339 
PHRAS-1516 Port PHRAS-1339
 2017-11-14 14:05:10 +01:00
Nicolas Maillat
0fcd88b6ca Merge pull request #2222 from mike-esokia/PHRAS-1505_port_PHRAS-1399 
PHRAS-1505 port PHRAS-1399
 2017-08-28 17:12:49 +02:00
Nicolas Maillat
376a9d79d9 Merge pull request #2221 from mike-esokia/PHRAS-1504_port_PHRAS-392 
PHRAS-1504 port PHRAS-392
 2017-08-28 16:56:43 +02:00
Mike Ng
1f4f6da278 fix label tab thesaurus 2017-08-23 13:48:20 +04:00
Mike Ng
2d17177ded hide facets containing single element from preference menu 2017-08-22 17:07:05 +04:00
Mike Ng
0394773521 refactor links of documentation to 4.0 2017-08-22 13:29:12 +04:00
Mike Ng
48dff55226 refactor link for documentation to 4.1 2017-08-22 13:21:06 +04:00
Mike Ng
be17fd8e0d fix event listener for button export / download 2017-08-22 12:03:26 +04:00
Mike Ng
9ed6a0210f Porting PHRAS-1434, PHRAS-1435, PHRAS-1436, PHRAS-1437, PHRAS-1457 to 4.1 2017-08-21 14:34:53 +04:00
Mike Ng
83016d1d94 refactor google chart on popularity tab 2017-08-16 13:56:24 +04:00
Mike Ng
191a59c827 add search to candidate tab 
refactor search_term function in backend
 2017-08-15 12:54:16 +04:00
Mike Ng
a0cad9ec8f Fix localization in datepicker - admin 2017-08-14 10:26:52 +04:00
Mike Ng
64ad521d61 add filter to user list 2017-08-03 14:31:03 +04:00
Mike Ng
a07bfecd85 add feedback and reload side menu when activating collection 2017-08-03 11:55:53 +04:00
Mike Ng
9e258cfae4 fix navigation user list and refactor layout 2017-08-02 17:18:53 +04:00
Thibaud Fabre
cc6efb0dc9 Merge 4.0 into master 2016-12-06 15:34:13 +01:00
Thibaud Fabre
aa5041dbf4 Change order and wording for base ID in collection details 2016-12-06 14:55:23 +01:00
Thibaud Fabre
97f2e66698 Merge 4.0 branch 2016-12-05 17:04:54 +01:00
Thibaud Fabre
b5bbb1851f Merge branch 4.0 2016-12-05 15:26:48 +01:00
Thibaud Fabre
b84c35ff66 Merge pull request #2022 from xrousset78800/fix/add-warning-message-on-admin 
Add warn message in admin
 2016-12-05 12:26:49 +01:00
Xavier Rousset
cadb9febab PHRAS-1220 Add warn message in admin fields setup 2016-12-02 15:26:31 +01:00
Xavier Rousset
e7dd94d5b8 Fix misplaced icon on admin dashboard 2016-12-01 15:03:34 +01:00
Thibaud Fabre
77c848f32e Merge pull request #2008 from jygaulier/PHRAS-1260_INDEX-WIDTH-HEIGHT 
Phras 1260 index width height
 2016-11-03 16:22:26 +01:00
Jean-Yves Gaulier
229c80fe74 PHRAS-1260_INDEX-WIDTH-HEIGHT 
- new : added size (filesize) of document to es
 - new : methods getWidth(),... to record_adapter
 - fix : template
 2016-11-03 15:27:57 +01:00
Jean-Yves Gaulier
45eea29710 PHRAS-508_acl-cache 
- fix unit tests
 2016-10-26 19:14:11 +02:00
Jean-Yves Gaulier
0c75189a64 PHRAS-508_acl-cache 
- refactor : acl strings changed to ACL class constants
 - code cleanup
 - wip but try to merge for bc break test
 2016-10-26 16:13:47 +02:00
Jean-Yves Gaulier
642da0fca5 PHRAS-508_acl-cache 
- wip
 2016-10-26 16:13:47 +02:00
Jean-Yves Gaulier
6a2285f66d PHRAS-508_acl-cache 
- wip
 2016-10-26 16:13:47 +02:00
Thibaud Fabre
73de45f0f9 Merge pull request #1994 from xrousset78800/fix/zxcvbn-strenght-password-is-missing 
Zxcvbn strength password is missing
 2016-10-24 15:37:04 +02:00
Xavier Rousset
9a2e4677d9 Add missing slash on zxcvbn path 2016-10-24 15:18:41 +02:00
Thibaud Fabre
4acd20fa80 Revert "Revert "PHRAS-714_thesaurus_indexation"" 2016-10-18 21:17:10 +02:00
Thibaud Fabre
ba8be47423 Revert "PHRAS-714_thesaurus_indexation" 2016-10-18 20:15:23 +02:00
Thibaud Fabre
e413eff4f9 Merge pull request #1978 from jygaulier/PHRAS-714 
PHRAS-714_thesaurus_indexation
 2016-10-18 10:11:46 +02:00
Thibaud Fabre
fd61435468 Improve task manager logs 
Available versions are now sorted by date in descending order
 2016-10-13 15:23:25 +02:00
Jean-Yves Gaulier
cf40c99ea7 PHRAS-714_thesaurus_indexation 
- new : if the thesaurus has been modified since it's last indexation, it will be re-indexed as soon a record is to be indexed.
 - nb : after thesaurus modification, the databox MUST be manually re-indexed (which will reindex the thesaurus before)
 - todo : remove useless dialog boxes from thesaurus app (... "this term was..."  "...add with/out reindexing ?..."). To be done in the future app using future routes.
 2016-10-12 18:42:16 +02:00
Xavier Rousset
7945994140 PHRAS-1173 SQL fix and template update 2016-10-11 15:27:13 +02:00
Thibaud Fabre
01281c2942 Merge pull request #1970 from xrousset78800/fix/update-sharing-logo 
Update logos on sharing page
 2016-10-04 14:58:23 +02:00
Xavier Rousset
632c799f3e PHRAS-1127 Update logos on sharing page 2016-10-04 14:48:15 +02:00
Thibaud Fabre
cdc410191c Merge pull request #1960 from jygaulier/PHRAS-1192_quarantaine-by-filenames_4.0 
PHRAS-1192_quarantaine-by-filenames_4.0
 2016-09-29 14:11:08 +02:00