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,599 Commits 268 Branches 107 Tags
76d0cef9b58cf9d1ecc87ce01aa92b61b8d392aa
Commit Graph

570 Commits

Author SHA1 Message Date
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
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
fd61435468 Improve task manager logs 
Available versions are now sorted by date in descending order
 2016-10-13 15:23:25 +02:00
Xavier Rousset
0b16fd577e PHRAS-1234 Change wording on setup template 2016-09-27 12:24:03 +02:00
Thibaud Fabre
884d59462c Remove autosubmit from order manager list 2016-07-29 15:05:39 +02:00
Thibaud Fabre
303a39e359 Allow removing order masters without adding a new one 2016-07-29 14:46:18 +02:00
Florian BLOUET
de2c283667 PHRAS-1121 - Admin: fix collection reordering 2016-05-26 11:29:42 +02:00
Thibaud Fabre
f4d71eeb63 Display unique collection IDs in collection admin 2016-05-24 17:30:02 +02:00
Florian BLOUET
4e1ebe7b0d PHRAS-1084 - fix admin tooltip conflict 2016-05-11 14:51:12 +02:00
Benoît Burnichon
1e18b3e69f This is a combination of 33 commits. 
- Squashed Pull request #1730
- Squashed Pull request #1741
- Squashed Pull request #1742
- Squash merge branch 4.0
- Squashed Pull request #1744
- Squashed Pull request #1746
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed Pull request #1758
- Avoid using imagine/imagine alias as it is causing install issues
- Squashed merge branch 4.0
- Squashed Pull request #1763
- Squashed merge branch 4.0
- Squash of 6 commits
- Squashed merge branch 4.0
- This is a combination of 2 commits.
- Squashed Pull request #1775
- Squashed Pull request #1777
- Squashed Pull request #1779
- Squashed Pull request #1780
- Squashed Pull request #1782
- Adds a Pull request template
- Squased Pull request #1783
- Squash Pull request #1786
- Squashed Pull request #1796
- Squashed merge branch 4.0
- Squash Pull request #1791
- Squashed merge branch 4.0
- Squashed Pull request #1808
- Squashed Pull request #1811
- Squashed Pull request #1809
 2016-04-20 16:22:14 +02:00
Benoît Burnichon
9313f3da2b Added new Twig filter to sort a collection set. 
Only currently used in admin/tree.html.twig but could be used in collection rights.
 2016-03-17 11:24:59 +01:00
Benoît Burnichon
814cf30b3e Add slugified flag name in admin 2016-03-15 18:03:24 +01:00
Florian BLOUET
392f5bea7d PHRAS-978 - fix task management form 2016-02-17 18:52:53 +01:00
Benoît Burnichon
403eb36903 Demote Admin users on request 2016-02-09 12:25:28 +01:00
Florian BLOUET
25f4bfd493 PHRAS-912 - Admin fix error 400 when sending test email 2016-02-08 17:15:26 +01:00
Benoît Burnichon
f501cba16b Extract whether subdef metadata updates are required 2016-01-22 17:39:33 +01:00
Florian BLOUET
e176fa2ffb PHRAS-910 - fix admin suggested value edition in collection settings 2016-01-20 11:32:03 +01:00
Benoît Burnichon
bce0236fc4 Update plugin_name translation key. 2016-01-12 20:18:36 +01:00
Florian BLOUET
1f0c30fdb3 PHRAS-899 - fix loadImage dependency in statusbit edition and feed edition 2016-01-08 16:43:25 +01:00
Florian BLOUET
687b815114 fix plugins image path 2016-01-08 11:18:06 +01:00
Jean-Yves Gaulier
2a40e8230d #PHRAS-846 time 5m 
fix twig error
 2015-12-28 17:51:28 +01:00
Jean-Yves Gaulier
62df4a806f PHRAS-846 #time 1d 
display of tasks logs in admin is ok.
if many logs (logrotate) display links
 2015-12-28 15:14:56 +01:00
Jean-Yves Gaulier
8a012973bc wip 2015-12-23 15:56:54 +01:00
Jean-Yves Gaulier
78be8977de wip 2015-12-23 11:14:55 +01:00
Florian BLOUET
205aae28de PHRAS-450 - fix captured images dimension issue 
Admin - allow input value change for sliders
fix misc css issues
update jquery checked attr into prop
 2015-12-03 15:24:29 +01:00
Florian BLOUET
ebaf36f2d2 PHRAS-845 - fix close button 
PHRAS-846 - fix admin log view
PHRAS-843 - fix action icons
added white skin
misc fix on skin color handling
replace image icons by fonts icons
 2015-12-02 17:35:42 +01:00
Florian BLOUET
cdff031887 fix admin reoladTree callback 
fix admin leftPanel render method
fix admin reorder submit callback
remove usless images
 2015-12-02 17:35:42 +01:00
Florian BLOUET
0621c3fe55 PHRAS-834 - fix tasks dropdown menu 2015-12-02 17:35:41 +01:00
Florian BLOUET
5d2735cd0a update jquery attr into prop method for checked and disabled properties 2015-12-02 17:35:41 +01:00
Florian BLOUET
52b06b208e css cleanup: main menu, misc - admin: fixes js issues 2015-12-02 17:35:40 +01:00
Florian BLOUET
1010f1820c fix admin tinymce init, misc admin fixes 2015-12-02 17:35:40 +01:00
Florian BLOUET
42ab150113 wip: cleanup prod skins 2015-12-02 17:35:39 +01:00
Florian BLOUET
0e97e4a0ae moved skins/icon to assets/common/images/icons 2015-12-02 17:35:37 +01:00
Florian BLOUET
f186091823 wip: component reorg, gathering js, css, images, ... 2015-12-02 17:35:36 +01:00
Florian BLOUET
d729ac441b refactor build as components, wip: gathering js, css, images, ... 2015-12-02 17:35:36 +01:00
Florian BLOUET
285edaf504 wip - refactoring frontend dependency and build tools - removed deprecated features (client interface) 2015-12-02 17:35:36 +01:00
Benoît Burnichon
f4b8556d70 Reenable geonames in edit users and register 2015-11-19 17:56:51 +01:00
Benoît Burnichon
dd8c11d3b6 Fixup subdef-editor databox selector 2015-11-16 15:50:15 +01:00
Benoît Burnichon
9cf6e09d5b Some more Templates fixups. 2015-10-30 08:39:28 +01:00
Benoît Burnichon
6ba4402078 Should use trans filter and not trans tag 2015-10-29 11:12:07 +01:00
Florian BLOUET
e52380540d fix default include path for plugins 2015-10-28 14:50:29 +01:00