arturo-c

diff --git a/www/sites/all/modules/contrib/fullcalendar/fullcalendar.module b/www/sites/all/modules/contrib/fullcalendar/fullcalendar.module
index 121ac43..c2fc7e3 100644
--- a/www/sites/all/modules/contrib/fullcalendar/fullcalendar.module
+++ b/www/sites/all/modules/contrib/fullcalendar/fullcalendar.module
@@ -186,6 +186,10 @@ function theme_fullcalendar_classname($node) {
  * Pass settings to JavaScript.
  */
 function template_preprocess_views_view_fullcalendar(&$vars) {
+  $timezone = date_default_timezone_name();
+  $dateTime = new DateTime();

arturo-c

diff --git a/www/sites/all/modules/apci_features/apci_public_api_services/apci_public_api_services.services.inc b/www/sites/all/modules/apci_features/apci_public_api_services/apci_public_api_services.services.inc
index de1ed1d..3eacceb 100755
--- a/www/sites/all/modules/apci_features/apci_public_api_services/apci_public_api_services.services.inc
+++ b/www/sites/all/modules/apci_features/apci_public_api_services/apci_public_api_services.services.inc
@@ -128,6 +128,9 @@ function apci_public_api_services_default_services_endpoint() {
         'subgroups' => array(
           'enabled' => 1,
         ),
+        'roles' => array(
+          'enabled' => 1,

arturo-c

diff --git a/plugins/export_ui/services_ctools_export_ui.class.php b/plugins/export_ui/services_ctools_export_ui.class.php
index fe4a51d..99de0c4 100644
--- a/plugins/export_ui/services_ctools_export_ui.class.php
+++ b/plugins/export_ui/services_ctools_export_ui.class.php
@@ -23,6 +23,14 @@ class services_ctools_export_ui extends ctools_export_ui {
     return drupal_get_form('services_edit_form_endpoint_authentication', $item);
   }
 
+  /**
+   * Page callback for the server page.

arturo-c

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 90aa405..cc2cb52 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -2,6 +2,6 @@ Trying to remember to document major API changes here
 
 - hook_services_authentication_info() no longer uses the 'alter_browse_form', 'alter_browse_form_validate' or 'alter_browse_form_submit' callbacks since the browser is gone.
 
-- service definitions are now divided into predefined classes (create, retrieve, update, delete, actions, targeted actions, relationships) and the available keys have all changed/been removed/been added to in a variety of ways since 2.x.
+- service definitions are now divided into predefined classes (create, retrieve, update, delete, actions, targeted_actions, relationships) and the available keys have all changed/been removed/been added to in a variety of ways since 2.x.

arturo-c

<?php
/**
 * @file
 * Loads dependencies and defines the apci_groups resource
 */
module_load_include('inc', 'og_services', 'og_services');
module_load_include('inc', 'services_views', 'services_views.resource');
module_load_include('inc', 'apci_public_api_services', 'helpers');
function apci_public_api_services_groups_resource_definition() {
  $response = new GroupResponse;

arturo-c

<?php
/**
 * @file
 * Loads dependencies and defines the apci_groups resource
 */
module_load_include('inc', 'og_services', 'og_services');
module_load_include('inc', 'services_views', 'services_views.resource');
module_load_include('inc', 'apci_public_api_services', 'helpers');
function apci_public_api_services_groups_resource_definition() {
  $response = new GroupResponse;

arturo-c

[core]
	repositoryformatversion = 0
	filemode = true
	bare = false
	logallrefupdates = true
	ignorecase = true
[remote "origin"]
	fetch = +refs/heads/*:refs/remotes/origin/*
	url = [email protected]:arturo-c/allplayers-mainline.git
[branch "master"]

arturo-c

ubuntu:~/apci/www (remove_duplicate_emails_on_siblings)$ git pull mainline newmaster
From github.com:AllPlayers/allplayers-mainline
 * branch            newmaster  -> FETCH_HEAD
Auto-merging www/sites/all/modules/apci_features/apci_public_api_services/resources/user_resource.inc
CONFLICT (content): Merge conflict in www/sites/all/modules/apci_features/apci_public_api_services/resources/user_resource.inc
Automatic merge failed; fix conflicts and then commit the result.
ubuntu:~/apci/www (remove_duplicate_emails_on_siblings|MERGING)$ git status
# On branch remove_duplicate_emails_on_siblings
# Changes to be committed:
#

arturo-c

diff --git a/www/sites/all/modules/apci_features/apci_public_api_services/resources/user_resource.inc b/www/sites/all/modules/apci_features/apci_public_api_services/resources/user_resource.inc
old mode 100644
new mode 100755
index ef2c449..19c9510
--- a/www/sites/all/modules/apci_features/apci_public_api_services/resources/user_resource.inc
+++ b/www/sites/all/modules/apci_features/apci_public_api_services/resources/user_resource.inc
@@ -58,6 +58,20 @@ function apci_public_api_services_user_resource_definition() {
             'description' => 'User password', // @todo from *CCK* def
             'type' => 'string', // @todo from def
           ),

arturo-c

<?xml version="1.0" encoding="utf-8"?>
<result><form_errors><captcha_response>Solve this simple math problem &lt;br /&gt;(&lt;a class="why"&gt;&lt;span&gt;This math problem helps us weed out spammers&lt;/span&gt;Why?&lt;/a&gt;) field is required.</captcha_response></form_errors></result>