Commit Graph

318 Commits

Author SHA1 Message Date
Jocelyn Fiat
73be19fdfd Merge branch 'master' into es17.01 2017-04-07 11:29:23 +02:00
Jocelyn Fiat
f67116980d If gcse settings are not set, do not generate the gcse search form. 2017-04-07 11:27:01 +02:00
Jocelyn Fiat
38f9b6cc89 Merge branch 'master' into es17.01
# Conflicts:
#	examples/demo/demo.ecf
2017-04-06 15:40:14 +02:00
Jocelyn Fiat
5915af6a9c Added masquerade dev module and disabled it by default.
- it allows to login as a given user by passing security check.
  - it must be used only during development!
  - disabled by default!
Updated the session auth module to make it easier to be reused.
  - masquerade module is based on the session auth module.
2017-04-06 15:33:51 +02:00
Jocelyn Fiat
ad2b30f52b Changed the way search modules get integrated with the theme via a new region "search".
Improved current module for google search 2.0.
2017-04-06 14:02:20 +02:00
Jocelyn Fiat
e062429871 Merge remote-tracking branch 'jvelilla/roc_google_search2.0' into roc_gs2.0 2017-04-05 17:40:04 +02:00
jvelilla
1eae3b7413 Removed secret key from google search version 2.0 since is not needed. 2017-04-03 11:34:02 -03:00
jvelilla
72cfd1d652 Initial import Google Custom Search 2.0
Updated demo to use it.
2017-03-30 22:05:35 -03:00
Jocelyn Fiat
da25da8d91 Merge branch 'master' into es17.01 2017-03-30 19:15:47 +02:00
Jocelyn Fiat
3d2c30ea5f Fixed published node access. 2017-03-30 19:15:12 +02:00
Jocelyn Fiat
9d59f37138 Change a fixme into a comment. 2017-03-30 18:17:39 +02:00
Jocelyn Fiat
882922cea5 Merge branch 'master' into es17.01 2017-03-30 17:33:00 +02:00
Jocelyn Fiat
5273940b82 Fixed access to non published nodes (and also for the related revisions if any)! 2017-03-30 17:32:15 +02:00
Jocelyn Fiat
e547279016 Implemented save/publish/unpublish control on nodes.
Display on published blogs (except for admin, or author of the related blog).
2017-03-30 17:16:02 +02:00
Jocelyn Fiat
230ef8ed18 Fixed video filter to support STRING_GENERAL . 2017-03-30 16:48:11 +02:00
Jocelyn Fiat
00edd5aae2 Merge branch 'master' into es17.01 2017-03-30 15:41:30 +02:00
Jocelyn Fiat
a01d161864 Improved video content filter to be more flexible, and allow custom template. 2017-03-30 15:41:04 +02:00
Jocelyn Fiat
e3dd6cc8e8 Committed missing change for the cms formats administration. 2017-03-30 14:45:34 +02:00
Jocelyn Fiat
70973dd430 Committed missing change for the cms formats administration. 2017-03-30 14:44:54 +02:00
Jocelyn Fiat
7968471a54 Merge branch 'master' into es17.01 2017-03-30 14:28:28 +02:00
Jocelyn Fiat
cd48fe182a Always set the content type when it is known for node view. 2017-03-30 14:28:00 +02:00
Jocelyn Fiat
c261554a39 Merge branch 'master' into es17.01
# Conflicts:
#	examples/demo/demo.ecf
#	modules/admin/admin-safe.ecf
2017-03-30 12:03:41 +02:00
Jocelyn Fiat
3072b99151 Fixed installation access permission using administration.installation_access instead of previous admin.installation_access. 2017-03-30 11:58:53 +02:00
Jocelyn Fiat
0ce7d11e52 Implemented custom cms format, and associated administration pages.
Applied to existing filter and format.
Added embedded_video filter (initially contribute by Javier Velilla).
2017-03-30 11:58:44 +02:00
Jocelyn Fiat
134f876e62 Display the full url for uploaded files via the CMS_FILES_MODULE.
Keep db/mails in checkout.
2017-03-28 22:26:21 +02:00
5ca9a0cd85 Merge branch 'master' into es17.01 2017-03-24 18:44:49 +01:00
21e75a6492 Splitted administration and normal web site interfaces.
This optimises a bit the routing map, and make cleaner separation.
Make the base url for admin pages customizable via `administration.base_path` variable in cms.ini
   note: could be /admin, /roc-admin, or ..
It is possible to have a specific theme for administration via the variable "administration.admin"
2017-03-24 18:38:58 +01:00
59a8941635 Fixed xsi:schemaLocation. 2017-03-10 18:09:32 +01:00
bbfc0ce098 Merge branch 'master' into es17.01 2017-03-08 20:55:50 +01:00
b263e4a1b9 Support http caching on sitemap.xml . 2017-03-08 20:55:28 +01:00
2c89be666f Merge branch 'master' into es17.01 2017-03-08 10:48:37 +01:00
941f50e4fb Removed obsolete calls. 2017-03-08 10:43:27 +01:00
82ff68c914 Merge branch 'master' into es17.01 2017-03-06 21:28:00 +01:00
67f6591851 Better control on path alias.
If user has permission to edit, provide a text input, otherwise just a label if path are required.
Reviewed html generated for taxonomy field in node edit form.
Improved the blog entries list by providing (if permitted) link to blog entry creation, and link to the user entries or all entries.
2017-03-06 21:27:35 +01:00
4dcd2693e3 Merge branch 'master' into es17.01 2017-03-03 18:53:33 +01:00
7cde24a439 Protected again sql error.
Return better sql error message for sqlite3 storage.
2017-03-03 18:53:11 +01:00
c7222d5fcc Merge branch 'master' into es17.01 2017-03-03 13:37:19 +01:00
2fc0c6f7b7 Fixed wrong initial offset. 2017-03-03 13:36:56 +01:00
18424e6db7 Merge branch 'master' into es17.01
# Conflicts:
#	modules/node/node-safe.ecf
2017-03-03 13:17:31 +01:00
bb25a8b12e Added feed ordered by publication on /nodes/{type}/feed. 2017-03-03 13:16:04 +01:00
79df423c7a Merge branch 'master' into es17.01 2017-03-03 11:18:12 +01:00
0febe3418b (Breaking change) added notion of editor vs author.
The table nodes and node_revisions have an extra "editor" field.
Update the sql table with:
  ALTER TABLE nodes ADD editor INTEGER ;
  UPDATE nodes SET editor = author;
  ALTER TABLE node_revisions ADD editor INTEGER ;
  UPDATE node_revisions SET editor = author;
2017-03-03 11:16:46 +01:00
6cb6dd1609 Added notion of author (owner) and editor to allow the editing of node by non owner users. 2017-03-03 11:12:51 +01:00
4cbdfeff06 Improved the user selection for messaging module. 2017-03-03 11:08:38 +01:00
12e02bdfbf Merge branch 'master' into es17.01
# Conflicts:
#	modules/blog/cms_blog_module-safe.ecf
2017-03-02 16:05:20 +01:00
f5671bc190 Display associated tags in blogs listing. 2017-03-02 16:02:45 +01:00
099dc968fd Merge branch 'master' into es17.01 2017-03-01 16:40:57 +01:00
a611b27ad9 Fixed node preview. 2017-03-01 16:33:17 +01:00
ac1f91d95a Merge branch 'master' into es17.01 2017-03-01 15:37:21 +01:00
8ff638d62e Fixed CMS_USER.creation_date retrieval.
Improved the admin users listing.
2017-03-01 15:36:58 +01:00