Laurent Destailleur
|
ff9312c96a
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/prelevement/card.php
htdocs/compta/prelevement/class/ligneprelevement.class.php
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/line.php
|
2020-06-08 20:36:54 +02:00 |
|
Laurent Destailleur
|
2e06ce306a
|
Tooltip
|
2020-06-08 15:03:10 +02:00 |
|
Laurent Destailleur
|
6ec2ff01f1
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/security.lib.php
htdocs/website/index.php
|
2020-06-07 23:15:13 +02:00 |
|
Laurent Destailleur
|
f7563818ac
|
css
|
2020-06-07 23:12:56 +02:00 |
|
Laurent Destailleur
|
148bdec96f
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-06-06 20:25:24 +02:00 |
|
Laurent Destailleur
|
fb02edf254
|
Fix For select language component, we force on root
|
2020-06-06 20:25:05 +02:00 |
|
Laurent Destailleur
|
788ec1f87d
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-06-06 20:18:51 +02:00 |
|
Laurent Destailleur
|
34778937c3
|
Fix link to image
|
2020-06-06 20:16:07 +02:00 |
|
Laurent Destailleur
|
f00b2d1e6f
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-06-06 20:11:57 +02:00 |
|
Laurent Destailleur
|
2d87da8815
|
Fix link
|
2020-06-06 20:11:01 +02:00 |
|
Laurent Destailleur
|
88aaec63f7
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-06-06 18:57:41 +02:00 |
|
Laurent Destailleur
|
7061e9b4cb
|
Fix deletion of website page
|
2020-06-06 18:57:24 +02:00 |
|
Laurent Destailleur
|
3197f717c3
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-06-06 17:12:58 +02:00 |
|
Laurent Destailleur
|
dd5b5e9bbf
|
Fix lang suggested in clone of page
|
2020-06-06 17:12:37 +02:00 |
|
Laurent Destailleur
|
8023bc2fbb
|
Fix cancel in media filemanager
|
2020-06-03 12:39:06 +02:00 |
|
Laurent Destailleur
|
51c578840c
|
Fix cancel in media filemanager
|
2020-06-03 12:39:00 +02:00 |
|
Laurent Destailleur
|
93320deddc
|
Fix cancel in media filemanager
|
2020-06-03 12:34:09 +02:00 |
|
Laurent Destailleur
|
66df7fca41
|
Fix cancel in media filemanager
|
2020-06-03 11:40:51 +02:00 |
|
Laurent Destailleur
|
2965dda815
|
Typo
|
2020-06-03 01:02:48 +02:00 |
|
Laurent Destailleur
|
a37a4031e9
|
FIX Delete of website page need permission. Conflict with mass action.
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/website/index.php
|
2020-06-03 01:02:19 +02:00 |
|
Laurent Destailleur
|
d4db1836d1
|
FIX Delete of website page need permission. Conflict with mass action.
|
2020-06-03 00:46:09 +02:00 |
|
Laurent Destailleur
|
1992b633ba
|
Fix phpcs
|
2020-05-28 20:02:07 +02:00 |
|
Laurent Destailleur
|
ada9c9addc
|
Fix count of records
|
2020-05-27 15:37:30 +02:00 |
|
Laurent Destailleur
|
7c653c0873
|
Fix count of records
|
2020-05-27 15:36:16 +02:00 |
|
Laurent Destailleur
|
00e88fcf76
|
Fix backtourl
|
2020-05-27 15:26:38 +02:00 |
|
Laurent Destailleur
|
264c1d6491
|
List website into combo sorted by position, ref fields
|
2020-05-27 14:50:10 +02:00 |
|
Laurent Destailleur
|
da8bd7507e
|
NEW Add mass action to set category on a list of website pages.
|
2020-05-26 22:29:46 +02:00 |
|
Laurent Destailleur
|
d51bf44f55
|
Add picto
|
2020-05-26 12:53:58 +02:00 |
|
Laurent Destailleur
|
05ac3de2f0
|
Enhance search / filter
|
2020-05-26 12:46:51 +02:00 |
|
Laurent Destailleur
|
2d30d33303
|
NEW Can filter on container type, language and tags in the list of pages
of website module.
|
2020-05-26 12:25:41 +02:00 |
|
Laurent Destailleur
|
3aaefd15b0
|
Fix set of categories
|
2020-05-26 01:07:43 +02:00 |
|
Laurent Destailleur
|
5f90596bb7
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-26 00:20:36 +02:00 |
|
Laurent Destailleur
|
f9f5beb064
|
NEW Can set tags/categories to website pages.
|
2020-05-26 00:19:32 +02:00 |
|
Frédéric FRANCE
|
e5402988d9
|
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
|
2020-05-24 17:58:18 +02:00 |
|
Laurent Destailleur
|
fd61214b97
|
Merge
|
2020-05-24 01:06:45 +02:00 |
|
Laurent Destailleur
|
127534ef55
|
Fix common var name seems to be $objref for subdir of doc
|
2020-05-23 20:09:31 +02:00 |
|
Frédéric FRANCE
|
5aa84c64d0
|
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
|
2020-05-23 18:54:33 +02:00 |
|
Frédéric FRANCE
|
2085ac73e7
|
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
|
2020-05-23 18:34:58 +02:00 |
|
Laurent Destailleur
|
748a120b71
|
Show button for categories if module is enabled
|
2020-05-23 15:50:15 +02:00 |
|
Laurent Destailleur
|
d4b1485c97
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-23 13:11:30 +02:00 |
|
Laurent Destailleur
|
755c47f900
|
Fix save of wrapper missing
|
2020-05-23 13:10:33 +02:00 |
|
Laurent Destailleur
|
333ae9d496
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-23 12:58:18 +02:00 |
|
Laurent Destailleur
|
aff2872fc1
|
Fix RSS
|
2020-05-23 12:57:58 +02:00 |
|
Laurent Destailleur
|
50d063256e
|
NEW Povide a RSS Feed for blogposts
|
2020-05-23 12:54:06 +02:00 |
|
Laurent Destailleur
|
e947ddba10
|
Fix RSS feed
|
2020-05-23 12:51:44 +02:00 |
|
Laurent Destailleur
|
f2c02f5559
|
FIX Language for RSS
|
2020-05-23 12:41:06 +02:00 |
|
Frédéric FRANCE
|
0f4f727d18
|
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
|
2020-05-22 08:27:12 +02:00 |
|
Laurent Destailleur
|
38c8ebd627
|
Add link into toolbar to create website tags
|
2020-05-22 01:01:27 +02:00 |
|
Laurent Destailleur
|
5d78f6dac5
|
NEW Add link to edit property from search result of website pages
|
2020-05-22 00:38:01 +02:00 |
|
stickler-ci
|
459154edc0
|
Fixing style errors.
|
2020-05-21 13:11:06 +00:00 |
|