Commit Graph

620 Commits

Author SHA1 Message Date
Jocelyn Fiat
5885ea84da Merge branch 'master' into es17.01 2017-04-11 13:38:27 +02:00
Jocelyn Fiat
1aad62ed52 Added CMS_RESPONSE.request_url (...)
Update a few callers of CMS_RESPONSE.url (...).
Renamed the demo files using "server" instead of "demo".
2017-04-11 13:19:39 +02:00
Jocelyn Fiat
87113e2f6f Merge branch 'master' into es17.01 2017-04-11 11:56:37 +02:00
Jocelyn Fiat
1f6fce1278 Improved theming for admin vs site.
- Added $theme_path, $base_path
- Added CMS_RESPONSE.module_resource_url (...) instead of using hardcoded "/module/" + name + ...
- Use base_path rather than base_url  (note ROC CMS is not yet working with EWF standalone "base" url option)
2017-04-11 11:56:04 +02:00
Jocelyn Fiat
3dc478b4a0 Fixed user registration activation workflow.
- Fixed new user insertion in SQL database.
 - Removed temp user when activated.
 - Renamed local variable names related to temp users.
 - More information when error occurs during user registration.
2017-04-10 21:51:41 +02:00
Jocelyn Fiat
85ac9f7366 Cosmetic. 2017-04-10 18:30:27 +02:00
Jocelyn Fiat
5a81d9a736 Merge branch 'master' into es17.01 2017-04-10 18:27:51 +02:00
Jocelyn Fiat
09a902d469 Make user activation procedure safer. 2017-04-10 18:27:19 +02:00
Jocelyn Fiat
5c2f5381aa Merge branch 'master' into es17.01
# Conflicts:
#	modules/google_search_20/google_search_20-safe.ecf
#	modules/google_search_20/google_search_20.ecf
2017-04-10 18:21:55 +02:00
Jocelyn Fiat
d26fc98492 Simplified the ecf for the google search 2.0 module.
Updated the install.bat (dev tool).
2017-04-10 18:20:13 +02:00
Jocelyn Fiat
fb52bfe099 Converted to 1-16-0 ecf version. 2017-04-10 18:14:48 +02:00
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
12089d7945 Use an advanced maintenance filter that supports #allow-user: and #allow-ip: . 2017-03-30 18:17:58 +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
d61fd85ea6 Item("") now returns the value itself (can be used to get all keys of specific object). 2017-03-30 15:43:07 +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
0d5630bb58 allow copy error during install 2017-03-30 14:47:02 +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
307a87eaf4 Better handling of path or location for administration links. 2017-03-24 21:56:48 +01: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
13cbb7d987 Fixed code by checking for file existence before checking if this is a directory. 2017-03-22 10:26:36 +01:00
dbfe14e77e Fixed cms execution initialization (avoid setting up twice router and filter). 2017-03-17 11:21:21 +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
a9581eff01 Added support for directory output email notification. 2017-03-08 10:46:29 +01:00
941f50e4fb Removed obsolete calls. 2017-03-08 10:43:27 +01:00