Jean-Yves Gaulier
f7b103af3d
PHRAS-2161_coll-id-in-log-docs_MASTER
...
- explicit message when databox is failed to mount.
- reconnect db for long migration scripts
- mark (comment) doctrine "binary_strings" type so the upgrade is not done every time because the field was read-back as "varchar"
- proposal on long migration scripts (could be faster)
2018-11-14 15:49:10 +01:00
aina-esokia
9c9d280250
port to 4.1 PHRAS-1868 database mount
2018-11-05 18:22:52 +04:00
aina-esokia
5dba9f64dd
add personalisation logo
2018-08-29 15:11:04 +04:00
aina-esokia
4da75f154d
add path field in subview window
2018-07-20 17:53:25 +04:00
aina-esokia
5488d5d47c
FIX create subview mediatype dropdown
2018-06-20 17:26:19 +04:00
aina-esokia
313c902a10
update SubdefsController
2018-06-11 18:20:37 +04:00
mike-esokia
8e71c52c7e
fix bug with special characters in status label
2018-05-16 15:00:14 +04:00
xrousset78800
4b0292619b
PHRAS-1317 Update DPI default value on presets ( #2519 )
2018-03-15 17:22:24 +01:00
Mike Ng
0c55bc7e09
update backend code for PHRAS-1783
2018-02-19 16:07:54 +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
a08a55b58e
Merge branch 'PHRAS-1745_PORT_custom_links' into PHRAS-1735_add_git_log
...
# Conflicts:
# .bowerrc
2018-01-08 16:37:46 +04:00
Mike Ng
30f49bdd35
resolve conflict
2018-01-08 15:57:13 +04:00
Mike Ng
bddc3781ba
resolve conflict
2018-01-08 15:54:47 +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
Xavier Rousset
c7f6b325d8
PHRAS-1766 Add orderable checkbox for each subdef - Remove order option on groups
2017-12-18 18:02:48 +01:00
Xavier Rousset
1683191d19
PHRAS-1719 Add presets selection on subdef admin page
2017-12-13 01:58:36 +01:00
Mike Ng
e0063d00c0
Porting custom-links to 4.1
2017-12-11 17:44:55 +04: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
88a2813843
Refactor setup controller and registry manipulator
2016-11-25 14:03:01 +01:00
Thibaud Fabre
53c2182588
PHRAS-1092 Prevent password reset when saving config in admin
2016-11-25 11:47:43 +01:00
Thibaud Fabre
d00d674cdf
Fix document substitution
2016-11-24 17:21:11 +01: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
dedd763581
Refactor databox service and controller
2016-10-19 07:00:33 +02:00
Thibaud Fabre
9a44033c00
Use databox service to mount databoxes in admin
2016-10-19 06:51:37 +02:00
Thibaud Fabre
32fe54ac35
Add databox mount command
2016-10-19 06:51:37 +02:00
Thibaud Fabre
efc5842e06
Add create databox console command
2016-10-19 06:51:37 +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
Thibaud Fabre
f62c22bc5c
Move setting to registry and form type
2016-09-28 20:58:26 +02:00
Thibaud Fabre
303a39e359
Allow removing order masters without adding a new one
2016-07-29 14:46:18 +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
Florian BLOUET
392f5bea7d
PHRAS-978 - fix task management form
2016-02-17 18:52:53 +01:00
Benoît Burnichon
7bb8484034
Remove unused use statement
2016-02-16 14:45:34 +01:00
Benoît Burnichon
ae97ad90e6
Method renaming to remove underscores
2016-02-12 17:29:21 +01:00
Benoît Burnichon
8910750928
Fix import users
...
PHRAS-966
2016-02-12 13:40:40 +01:00
Benoît Burnichon
403eb36903
Demote Admin users on request
2016-02-09 12:25:28 +01:00
Thibaud Fabre
6d2fd04765
Deduplicate rendering of databox/collection tree
2016-01-28 17:24:21 +01:00
Thibaud Fabre
c92d5da9fe
Merge branch 'clean-boxes' into merge-clean-boxes
2016-01-06 19:53:43 +01:00
Benoît Burnichon
e3f49db7b6
Merge pull request #1612 from jygaulier/PHRAS-846_tasks-logs
...
Phras 846 tasks logs
2016-01-06 10:14:48 +01:00
Benoît Burnichon
51023c5533
bump copyright year
2016-01-05 13:38:14 +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
0e97e4a0ae
moved skins/icon to assets/common/images/icons
2015-12-02 17:35:37 +01:00
Benoît Burnichon
f684550ab1
Merge pull request #1555 from bburnichon/rebase-web-gallery-v4
...
Rebase web gallery v4
2015-11-09 17:48:22 +01:00
Benoît Burnichon
034a8f5d14
Wrong Base Controller used in PluginsController
2015-11-09 16:10:25 +01:00
Thibaud Fabre
938c92b0c1
Disable demand status emails when mail notifications are disabled
2015-11-02 15:50:19 +01:00
Benoît Burnichon
4a4511b0a9
Add a fallback plugin handling twig
2015-10-28 14:50:14 +01:00
Benoît Burnichon
625df89bb7
Use Voter in Admin for configurationPanes
2015-10-28 14:48:50 +01:00
