hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 01:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,179 Commits 268 Branches 107 Tags
9fdd704d5a2d518392746cfb65c23a700004a09f
Commit Graph

1505 Commits

Author SHA1 Message Date
Filip Vilic
96488f5ca2 PHRAS-2212_refacto_admin_user_alerts 2018-09-05 16:08:18 +02:00
Mike Ng
0c55bc7e09 update backend code for PHRAS-1783 2018-02-19 16:07:54 +04:00
Mike Ng
1337a6994f refactored code to use newer version of backbone.js and underscore.js 2018-02-05 16:14:13 +04:00
Mike Ng
374f8eaff4 migrate backbone and underscore to npm and refactored test modules 2018-01-19 15:03:00 +04:00
Mike Ng
4f518c605d Merge branch 'PHRAS-1734_PORT_PHRAS-1589' into PHRAS-1744_PORT_PHRAS-1578_1579_1621_1675_1404_1336 
# Conflicts:
#	resources/locales/messages.de.xlf
#	resources/locales/messages.en.xlf
#	resources/locales/messages.fr.xlf
#	resources/locales/messages.nl.xlf
#	resources/locales/validators.de.xlf
#	resources/locales/validators.en.xlf
#	resources/locales/validators.fr.xlf
#	resources/locales/validators.nl.xlf
#	resources/www/admin/styles/main.scss
 2018-01-09 11:00:03 +04:00
Mike Ng
071ce25b31 porting PHRAS-1578/PHRAS-1579/PHRAS-1621/PHRAS-1675/PHRAS-1404/PHRAS-1336 to 4.1 2018-01-03 15:26:43 +04:00
Mike Ng
53b8ca4087 Porting PHRAS-1586/PHRAS-1602 to 4.1 2017-12-22 11:15:17 +04:00
Thibaud Fabre
b5bbb1851f Merge branch 4.0 2016-12-05 15:26:48 +01:00
Xavier Rousset
7f45d7ed01 PHRAS-1267 Add password strenght plugin to require vendor 2016-10-24 15:20:24 +02:00
Xavier Rousset
9a2e4677d9 Add missing slash on zxcvbn path 2016-10-24 15:18:41 +02:00
Thibaud Fabre
6d512b23f9 Add dev entry point for API 2016-05-24 15:58:16 +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
d2a5ca05bf Make Api routes uses same flow as web 2016-04-13 12:00:51 +02:00
Thibaud Fabre
450adb0847 Application bootstrap refactor 
- Extract environment properties in Environment class
- Replaces initialisation closure by ApplicationLoader class
- Removes undesirable error handling/PHP settings modifications
 2016-01-22 17:12:21 +01:00
Florian BLOUET
687b815114 fix plugins image path 2016-01-08 11:18:06 +01:00
Benoît Burnichon
51023c5533 bump copyright year 2016-01-05 13:38:14 +01:00
Florian BLOUET
53fdcf33bc add autoplay option for caption preview, removed useless audio and video libs 2015-12-14 15:21:28 +01:00
Florian BLOUET
60639d0e96 fix tests 2015-12-02 17:35:43 +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
7c31c1914c fixes themes path issues, moved vendor libraries 2015-12-02 17:35:38 +01:00
Florian BLOUET
5a34aa786a added jquery-treeview to bower, misc dependencies cleanup 2015-12-02 17:35:38 +01:00
Florian BLOUET
aade2f7884 prod component: removed jquery.vertical.buttonset lib 2015-12-02 17:35:38 +01:00
Florian BLOUET
416c8cf161 report component, js lib moved 2015-12-02 17:35:38 +01:00
Florian BLOUET
0f723c6f58 moved thesaurus js files, moved prod dependencies, removed unused pixastic dependency 2015-12-02 17:35:38 +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
3af725531b lightbox and report css refactoring, build tools cleanup 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
Nicolas Maillat
a3575d0280 candidat's query compliant with new grammar 2015-11-24 17:58:00 +01:00
Nicolas Maillat
45cee7e6e2 candidat query compliant new grammar 2015-11-24 14:17:59 +01:00
Benoît Burnichon
33e6a228ba Fixup facet namings. 
PHRAS-821 PHRAS-823
 2015-11-23 16:25:03 +01:00
Benoît Burnichon
663dbef92e Add Facet labels 2015-11-23 16:17:58 +01:00
Florian BLOUET
211ec6e3fa PHRAS-821 - sort facet by predefined order - sort facet alphabetically 2015-11-23 16:09:11 +01:00
Benoît Burnichon
f4b8556d70 Reenable geonames in edit users and register 2015-11-19 17:56:51 +01:00
Florian BLOUET
18f9542098 PHRAS-778 - deactivable documents type permalinks in tools modal 2015-11-18 18:55:05 +01:00
Florian BLOUET
7552d33a8f PLUG-90 - fix workzone toggle state 2015-10-28 13:12:26 +01:00
Florian BLOUET
75c9abbd1b PLUG-80 updated workzone plugin icon 2015-10-28 13:07:46 +01:00
Benoît Burnichon
924f20d19d Add Basic handling of plugins in admin 2015-10-28 13:05:00 +01:00
Florian BLOUET
41d9c18c04 update workzone for handling multiple plugins 2015-10-28 12:46:25 +01:00
Florian BLOUET
c2b8f1b957 remove accordion for plugin content tab 2015-10-28 12:15:21 +01:00
Florian BLOUET
dc7a50548a PHRAS-592 - css hotfix for overlay 2015-10-27 19:35:39 +01:00
Nicolas Le Goff
ba04588abe PHRAS-408 #fix 2015-10-27 13:49:31 +01:00
Nicolas Le Goff
11cc4fcc7c PHRAS-394 #fix 2015-10-27 13:26:50 +01:00