backup/ROC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
622 Commits 29 Branches 32 Tags
3389fb880933964e151f0860812d221a96ab992d
Commit Graph
48 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jocelyn Fiat 3389fb8809 Merge branch 'master' into es17.01 2017-05-12 15:59:59 +02:00
Jocelyn Fiat b814c91e91 Updated obsolete message with expected timestamp. 
Removed a few obsolete calls or implicit conversions.
 2017-05-12 15:59:31 +02:00
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
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
Jocelyn Fiat 10102e80fa Fixed a few grammar and style errors. 2015-11-23 16:57:49 +01:00
Jocelyn Fiat 53491274dc Merged CMS based on concurrent EWF (i.e ewf_v1) with blog branch. 2015-06-15 11:27:44 +02:00
Jocelyn Fiat 734f661add Merge pull request #21 from jvelilla/roc_jv_09042015 
Added missing descriptions/comments
 2015-04-10 10:50:52 +02:00
Jocelyn Fiat e40f8ee4d2 Fixed location of logs folder. 2015-02-03 19:25:38 +01:00
Jocelyn Fiat 83af7f6a38 Fixed shared logger code (there was an issue on non Windows machine) 
Now, it is possible to set logs folder from config file.
 2015-02-03 19:19:27 +01:00
Jocelyn Fiat 44a1dd62cb Merge pull request #12 from jvelilla/roc_template 
Refactor directory structrue	d963fd2
Fixed typo in readme.md
 2014-11-13 16:10:40 +01:00
Jocelyn Fiat 8ab4343d5b Merge pull request #11 from jvelilla/roc_template 
Added README documentation.
Renamed examples/roc_api to demo.
Added contracts
 2014-11-13 14:57:46 +01:00
Jocelyn Fiat 2aaed89417 Merge pull request #8 from jvelilla/roc_template 
Move libraries `layout', `model', `peristence' under cms folder
 2014-11-12 21:55:25 +01:00
Jocelyn Fiat 1d4e9df917 Merge pull request #6 from jvelilla/roc_template 
Updated Descriptions to classes and features
 2014-11-12 16:51:23 +01:00