civicrm-core.git
10 years agoFix IM label
Coleman Watts [Wed, 5 Mar 2014 18:31:14 +0000 (13:31 -0500)]
Fix IM label

10 years agoCRM-10693 - Trigger events and support drupal wysiwyg in popups
Coleman Watts [Wed, 5 Mar 2014 18:26:03 +0000 (13:26 -0500)]
CRM-10693 - Trigger events and support drupal wysiwyg in popups

10 years agoCRM-14165 - Remove placeholder where it's not wanted
Coleman Watts [Wed, 5 Mar 2014 18:25:26 +0000 (13:25 -0500)]
CRM-14165 - Remove placeholder where it's not wanted

10 years agoCurrentEmployer cleanup
Coleman Watts [Wed, 5 Mar 2014 16:23:42 +0000 (11:23 -0500)]
CurrentEmployer cleanup

10 years agoMerge pull request #2601 from colemanw/popups
colemanw [Mon, 3 Mar 2014 15:39:54 +0000 (10:39 -0500)]
Merge pull request #2601 from colemanw/popups

Popups improvement

10 years agoMerge pull request #2599 from JKingsnorth/CRM-14301
Kurund Jalmi [Mon, 3 Mar 2014 14:39:14 +0000 (20:09 +0530)]
Merge pull request #2599 from JKingsnorth/CRM-14301

CRM-14301 - Add 'is not one of' to report filtering on multiple select fields

10 years agoMerge pull request #2600 from kurund/relationship-cleanup
Kurund Jalmi [Mon, 3 Mar 2014 14:37:12 +0000 (20:07 +0530)]
Merge pull request #2600 from kurund/relationship-cleanup

removed obsolete code

10 years agoremoved obsolete code
kurund [Mon, 3 Mar 2014 14:36:30 +0000 (20:06 +0530)]
removed obsolete code

10 years agoCRM-14301
JKingsnorth [Mon, 3 Mar 2014 13:23:15 +0000 (13:23 +0000)]
CRM-14301

Add 'is not one of' to report filtering on multiple select fields

10 years agoMerge pull request #2597 from pratik-joshi/atif_work_on_fix_for_js_break
Kurund Jalmi [Mon, 3 Mar 2014 11:31:19 +0000 (17:01 +0530)]
Merge pull request #2597 from pratik-joshi/atif_work_on_fix_for_js_break

fix for : js break when adding new participant through contact screen

10 years agoMerge pull request #2598 from totten/master-invoker-cleanup
Tim Otten [Mon, 3 Mar 2014 09:07:57 +0000 (01:07 -0800)]
Merge pull request #2598 from totten/master-invoker-cleanup

CRM_Core_Invoke - Cleanup weird callbacks. Simplify callback convention.

10 years agoInvoker cleanup - Remove unused calling convention.
Tim Otten [Mon, 3 Mar 2014 09:03:17 +0000 (01:03 -0800)]
Invoker cleanup - Remove unused calling convention.

We'll want to introduce a different calling convention in the future.

10 years agoInvoker cleanup - Move profile() to its own class
Tim Otten [Mon, 3 Mar 2014 09:00:35 +0000 (01:00 -0800)]
Invoker cleanup - Move profile() to its own class

10 years agoInvoker cleanup - Remove dead AJAX callbacks
Tim Otten [Mon, 3 Mar 2014 08:28:19 +0000 (00:28 -0800)]
Invoker cleanup - Remove dead AJAX callbacks

10 years agoInvoker cleanup - Fix AJAX callbacks which misuse '::' notation
Tim Otten [Mon, 3 Mar 2014 08:27:39 +0000 (00:27 -0800)]
Invoker cleanup - Fix AJAX callbacks which misuse '::' notation

10 years agoatif_work_on_fix_for_js_break : moved inclusion of common/customData.tpl
Pratik Joshi [Mon, 3 Mar 2014 07:57:21 +0000 (13:27 +0530)]
atif_work_on_fix_for_js_break : moved inclusion of common/customData.tpl

10 years agoCRM-13863 Trigger change after contact create
Coleman Watts [Mon, 3 Mar 2014 03:00:38 +0000 (22:00 -0500)]
CRM-13863 Trigger change after contact create

10 years agoCRM-13966 - Default value for entityRef label
Coleman Watts [Mon, 3 Mar 2014 01:59:35 +0000 (20:59 -0500)]
CRM-13966 - Default value for entityRef label

10 years agoCRM-13863 Focus first form element in popups
Coleman Watts [Mon, 3 Mar 2014 01:59:10 +0000 (20:59 -0500)]
CRM-13863 Focus first form element in popups

10 years agoMerge pull request #2594 from colemanw/entityRef
colemanw [Sun, 2 Mar 2014 21:44:57 +0000 (16:44 -0500)]
Merge pull request #2594 from colemanw/entityRef

CRM-13966 - Refactor autocomplete custom field

10 years agoCRM-13966 - Cleanup profile dialog
Coleman Watts [Sun, 2 Mar 2014 21:25:21 +0000 (16:25 -0500)]
CRM-13966 - Cleanup profile dialog

10 years agoMerge pull request #2593 from kurund/relationship-form-fixes
Kurund Jalmi [Sun, 2 Mar 2014 20:07:22 +0000 (01:37 +0530)]
Merge pull request #2593 from kurund/relationship-form-fixes

relationship edit fixes: form breaks if note is not entered during add

10 years agorelationship edit fixes: form breaks if note is not entered during add
kurund [Sun, 2 Mar 2014 20:06:19 +0000 (01:36 +0530)]
relationship edit fixes: form breaks if note is not entered during add

10 years agoMerge pull request #2592 from kurund/relationship-form-fixes
Kurund Jalmi [Sun, 2 Mar 2014 19:57:58 +0000 (01:27 +0530)]
Merge pull request #2592 from kurund/relationship-form-fixes

fixed broken relationship form, bad ts() call

10 years agofixed broken relationship form, bad ts() call
kurund [Sun, 2 Mar 2014 19:47:47 +0000 (01:17 +0530)]
fixed broken relationship form, bad ts() call

10 years agoMerge pull request #2590 from colemanw/forms
Kurund Jalmi [Sun, 2 Mar 2014 19:19:09 +0000 (00:49 +0530)]
Merge pull request #2590 from colemanw/forms

CRM-14288 - Additional cleanup

10 years agoMerge pull request #2591 from kurund/CRM-14201
Kurund Jalmi [Sun, 2 Mar 2014 18:20:52 +0000 (23:50 +0530)]
Merge pull request #2591 from kurund/CRM-14201

CRM-14201, implement pager for contact relationship listing

10 years agocode cleanup, CRM-14201
kurund [Sun, 2 Mar 2014 18:19:42 +0000 (23:49 +0530)]
code cleanup, CRM-14201

----------------------------------------
* CRM-14201: Contact Relationships tab needs pagination
  http://issues.civicrm.org/jira/browse/CRM-14201

10 years agoCRM-13966 - Refactor autocomplete custom field
Coleman Watts [Sun, 2 Mar 2014 02:37:27 +0000 (21:37 -0500)]
CRM-13966 - Refactor autocomplete custom field

10 years agofixed enable action for past relationships CRM-14201
kurund [Sun, 2 Mar 2014 09:24:41 +0000 (14:54 +0530)]
fixed enable action for past relationships CRM-14201

----------------------------------------
* CRM-14201: Contact Relationships tab needs pagination
  http://issues.civicrm.org/jira/browse/CRM-14201

10 years agono need to block and unblock, CRM-14201
kurund [Sun, 2 Mar 2014 09:11:47 +0000 (14:41 +0530)]
no need to block and unblock, CRM-14201

----------------------------------------
* CRM-14201: Contact Relationships tab needs pagination
  http://issues.civicrm.org/jira/browse/CRM-14201

10 years agoCRM-13966 - Refactor event fee autocomplete
Coleman Watts [Sun, 2 Mar 2014 01:37:14 +0000 (20:37 -0500)]
CRM-13966 - Refactor event fee autocomplete

10 years agozero record text fixes CRM-14201
kurund [Sat, 1 Mar 2014 23:36:33 +0000 (05:06 +0530)]
zero record text fixes CRM-14201

----------------------------------------
* CRM-14201: Contact Relationships tab needs pagination
  http://issues.civicrm.org/jira/browse/CRM-14201

10 years agozero record text fixes CRM-14201
kurund [Sat, 1 Mar 2014 23:06:27 +0000 (04:36 +0530)]
zero record text fixes CRM-14201

----------------------------------------
* CRM-14201:
  http://issues.civicrm.org/jira/browse/CRM-14201

10 years agoadded relationship selector on user dashboard CRM-14201
kurund [Sat, 1 Mar 2014 22:57:36 +0000 (04:27 +0530)]
added relationship selector on user dashboard CRM-14201

----------------------------------------
* CRM-14201: Contact Relationships tab needs pagination
  http://issues.civicrm.org/jira/browse/CRM-14201

10 years agorefresh all datatables on the page during enable/disable action CRM-14201
kurund [Sat, 1 Mar 2014 22:05:33 +0000 (03:35 +0530)]
refresh all datatables on the page during enable/disable action CRM-14201

----------------------------------------
* CRM-14201: Contact Relationships tab needs pagination
  http://issues.civicrm.org/jira/browse/CRM-14201

10 years agofixed enable/disable actions, CRM-14201
kurund [Sat, 1 Mar 2014 21:21:58 +0000 (02:51 +0530)]
fixed enable/disable actions, CRM-14201

----------------------------------------
* CRM-14201: Contact Relationships tab needs pagination
  http://issues.civicrm.org/jira/browse/CRM-14201

10 years agoCRM-14201, converted contact relationship listing to ajax/datatable listing
kurund [Sat, 1 Mar 2014 20:57:31 +0000 (02:27 +0530)]
CRM-14201, converted contact relationship listing to ajax/datatable listing

----------------------------------------
* CRM-14201: Contact Relationships tab needs pagination
  http://issues.civicrm.org/jira/browse/CRM-14201

10 years agoMerge pull request #2589 from tttp/crm-14289
colemanw [Sat, 1 Mar 2014 16:14:23 +0000 (11:14 -0500)]
Merge pull request #2589 from tttp/crm-14289

remove ".js" suffix so it doesn't broke under nginx

10 years agoCRM-14288 - Remove unused datatable callback
Coleman Watts [Sat, 1 Mar 2014 12:59:53 +0000 (07:59 -0500)]
CRM-14288 - Remove unused datatable callback

10 years agoremove .js so it doesn't broke under nginx
Xavier Dutoit [Sat, 1 Mar 2014 10:13:44 +0000 (11:13 +0100)]
remove .js so it doesn't broke under nginx

10 years agoMerge pull request #2587 from colemanw/forms
Kurund Jalmi [Sat, 1 Mar 2014 06:34:20 +0000 (12:04 +0530)]
Merge pull request #2587 from colemanw/forms

CRM-14288 - Refactor and simplify relationship form

10 years agoCRM-13966 - Remove CRM_Contact_Form_NewContact and related functions
Coleman Watts [Sat, 1 Mar 2014 03:19:36 +0000 (22:19 -0500)]
CRM-13966 - Remove CRM_Contact_Form_NewContact and related functions

10 years agoCRM-14288 - Remove unnecessary relationship ajax callback
Coleman Watts [Sat, 1 Mar 2014 03:03:38 +0000 (22:03 -0500)]
CRM-14288 - Remove unnecessary relationship ajax callback

10 years agoCRM-14288 - Change th ids to prevent dom conflicts with date fields
Coleman Watts [Sat, 1 Mar 2014 03:02:54 +0000 (22:02 -0500)]
CRM-14288 - Change th ids to prevent dom conflicts with date fields

10 years agoCRM-14288 - Refactor and simplify relationship form
Coleman Watts [Sat, 1 Mar 2014 03:01:55 +0000 (22:01 -0500)]
CRM-14288 - Refactor and simplify relationship form

10 years agoCRM-14288 - Make select2 renderer a public utility fn
Coleman Watts [Sat, 1 Mar 2014 03:01:38 +0000 (22:01 -0500)]
CRM-14288 - Make select2 renderer a public utility fn

10 years agoAdd no-popup to contact links
Coleman Watts [Sat, 1 Mar 2014 02:59:43 +0000 (21:59 -0500)]
Add no-popup to contact links

10 years agoMerge pull request #2585 from davecivicrm/CRM-14286
Dave Greenberg [Sat, 1 Mar 2014 01:19:09 +0000 (17:19 -0800)]
Merge pull request #2585 from davecivicrm/CRM-14286

CRM-14286 - Contact mailings tab should show opens and clicks for curren...

10 years agoCRM-14286 - Contact mailings tab should show opens and clicks for currently viewed...
Dave Greenberg [Sat, 1 Mar 2014 01:16:53 +0000 (17:16 -0800)]
CRM-14286 - Contact mailings tab should show opens and clicks for currently viewed contact. This commit cannot be backported to 4.3 without adjustment  since CRM_Mailing_BAO_Job has been renamed to CRM_Mailing_BAO_MailingJob as of 4.4.

----------------------------------------
* CRM-14286: Contact Mailings tab selector should show Open and Click activity specfic to the currently viewed contact
  http://issues.civicrm.org/jira/browse/CRM-14286

10 years agoMerge pull request #2584 from davecivicrm/fixCiviMailSampleLink
Dave Greenberg [Sat, 1 Mar 2014 00:59:08 +0000 (16:59 -0800)]
Merge pull request #2584 from davecivicrm/fixCiviMailSampleLink

Fix deprecated link in sample message template - should go to new hostin...

10 years agoFix deprecated link in sample message template - should go to new hosting provider...
Dave Greenberg [Sat, 1 Mar 2014 00:58:03 +0000 (16:58 -0800)]
Fix deprecated link in sample message template - should go to new hosting provider page.

10 years agoMerge pull request #2583 from northwind2/CRM-14281
dlobo [Fri, 28 Feb 2014 23:07:56 +0000 (15:07 -0800)]
Merge pull request #2583 from northwind2/CRM-14281

CRM-14281 call hook_civicrm_config() in loadbootstrap()

10 years agoCRM-14281 call hook_civicrm_config() in loadbootstrap()
northwind2 [Fri, 28 Feb 2014 21:31:01 +0000 (21:31 +0000)]
CRM-14281 call hook_civicrm_config() in loadbootstrap()

----------------------------------------
* CRM-14281: hook_civicrm_config does not get called when using Joomla bootstrap
  http://issues.civicrm.org/jira/browse/CRM-14281

10 years agoMerge pull request #2567 from giant-rabbit/cart_financial_transactions
Dave Greenberg [Fri, 28 Feb 2014 19:08:12 +0000 (11:08 -0800)]
Merge pull request #2567 from giant-rabbit/cart_financial_transactions

CRM-14268 - Make CiviCRM's event registration cart record financial tran...

10 years agoMerge pull request #2578 from pratik-joshi/CRM-13992
pratik-joshi [Fri, 28 Feb 2014 11:19:39 +0000 (16:49 +0530)]
Merge pull request #2578 from pratik-joshi/CRM-13992

CRM-13992 : minor warning fix

10 years agoCRM-13992 : minor warning fix
Pratik Joshi [Fri, 28 Feb 2014 11:14:17 +0000 (16:44 +0530)]
CRM-13992 : minor warning fix

10 years agoAdd lo-dash js to core resources
Coleman Watts [Thu, 27 Feb 2014 23:51:09 +0000 (18:51 -0500)]
Add lo-dash js to core resources

10 years agoUpdate Group.php
Dave Greenberg [Thu, 27 Feb 2014 23:04:14 +0000 (15:04 -0800)]
Update Group.php

Clarify and fix typo in formRule message.

10 years agoMerge pull request #2557 from pratik-joshi/CRM-13992
Dave Greenberg [Thu, 27 Feb 2014 23:01:25 +0000 (15:01 -0800)]
Merge pull request #2557 from pratik-joshi/CRM-13992

Crm 13992

10 years agoMerge pull request #2575 from lcdservices/CRM-14287
Dave Greenberg [Thu, 27 Feb 2014 21:37:27 +0000 (13:37 -0800)]
Merge pull request #2575 from lcdservices/CRM-14287

CRM-14287 include contrib ID in post process object

10 years agoCRM-14287 include contrib ID in post process object
Brian Shaughnessy [Thu, 27 Feb 2014 19:59:34 +0000 (14:59 -0500)]
CRM-14287 include contrib ID in post process object

10 years agoMerge pull request #2572 from donordepot/issue_tracker
colemanw [Thu, 27 Feb 2014 17:43:24 +0000 (12:43 -0500)]
Merge pull request #2572 from donordepot/issue_tracker

Add directions on where to report issues.

10 years agoAdd directions on where to report issues.
David Barratt [Thu, 27 Feb 2014 16:40:27 +0000 (11:40 -0500)]
Add directions on where to report issues.

10 years agoCRM-13992 : QA fixes mentioned in #comment-57745
Pratik Joshi [Thu, 27 Feb 2014 16:09:55 +0000 (21:39 +0530)]
CRM-13992 : QA fixes mentioned in #comment-57745

10 years agoCleanup admin form buttons
Coleman Watts [Thu, 27 Feb 2014 15:17:48 +0000 (10:17 -0500)]
Cleanup admin form buttons

10 years agoCRM-13992 : COPY action implementation
Pratik Joshi [Tue, 25 Feb 2014 13:11:03 +0000 (18:41 +0530)]
CRM-13992 : COPY action implementation

10 years agoCRM-13992 : custom data single record view handling, DELETE action handling, QA check...
Pratik Joshi [Mon, 24 Feb 2014 15:30:17 +0000 (21:00 +0530)]
CRM-13992 : custom data single record view handling, DELETE action handling, QA checks and fixes

10 years agoCRM-13992 : handling multi-custom data listing, edit, add, view actions. reused profi...
Pratik Joshi [Sat, 22 Feb 2014 15:36:46 +0000 (21:06 +0530)]
CRM-13992 : handling multi-custom data listing, edit, add, view actions. reused profile code for listing and extended custom data engine for multi-value custom handling

10 years agoCRM-13992 coding neccessary property values / configurable options required for tab...
Pratik Joshi [Tue, 18 Feb 2014 13:13:31 +0000 (18:43 +0530)]
CRM-13992 coding neccessary property values / configurable options required for tab table layout orientation

10 years agoMerge pull request #2569 from colemanw/ac
colemanw [Thu, 27 Feb 2014 02:49:26 +0000 (21:49 -0500)]
Merge pull request #2569 from colemanw/ac

Autocomplete refactoring

10 years agoCRM-13966 - Migrate case autocompletes to select2
Coleman Watts [Thu, 27 Feb 2014 01:45:37 +0000 (20:45 -0500)]
CRM-13966 - Migrate case autocompletes to select2

10 years agoCleanup tpl whitespace and ts
Coleman Watts [Wed, 26 Feb 2014 21:58:23 +0000 (16:58 -0500)]
Cleanup tpl whitespace and ts

10 years agoCiviCase tpl cleanup
Coleman Watts [Wed, 26 Feb 2014 16:50:31 +0000 (11:50 -0500)]
CiviCase tpl cleanup

10 years agoFix undefined index
Coleman Watts [Wed, 26 Feb 2014 16:49:37 +0000 (11:49 -0500)]
Fix undefined index

This function doesn't seem to do anything and throws an undefined index warning. Linking cases seems to work fine without it.

10 years agoAdd hover class to buttons
Coleman Watts [Wed, 26 Feb 2014 00:37:43 +0000 (19:37 -0500)]
Add hover class to buttons

10 years agoMerge pull request #2550 from lcdservices/CRM-13319
Dave Greenberg [Tue, 25 Feb 2014 23:42:46 +0000 (15:42 -0800)]
Merge pull request #2550 from lcdservices/CRM-13319

CRM-13319 social media links

10 years agoMerge pull request #2560 from JoeMurray/patch-1
Dave Greenberg [Tue, 25 Feb 2014 23:00:26 +0000 (15:00 -0800)]
Merge pull request #2560 from JoeMurray/patch-1

CRM-14273 Added localizable to title and instructions

10 years agoCampaign Query - search form tweaks adding select2
Coleman Watts [Tue, 25 Feb 2014 21:40:08 +0000 (16:40 -0500)]
Campaign Query - search form tweaks adding select2

10 years agoCRM-13966 - Migrate campaign form autocompletes
Coleman Watts [Tue, 25 Feb 2014 21:19:45 +0000 (16:19 -0500)]
CRM-13966 - Migrate campaign form autocompletes

10 years agoRename autocomplete term variable for consistency
Coleman Watts [Tue, 25 Feb 2014 21:02:01 +0000 (16:02 -0500)]
Rename autocomplete term variable for consistency

10 years agoAdded localizable to title and instructions
JoeMurray [Tue, 25 Feb 2014 20:42:29 +0000 (15:42 -0500)]
Added localizable to title and instructions

10 years agoImprove tag form and metadata
Coleman Watts [Tue, 25 Feb 2014 20:32:20 +0000 (15:32 -0500)]
Improve tag form and metadata

10 years agoCRM-13966 - Migrate mergeTags to use select2
Coleman Watts [Tue, 25 Feb 2014 19:56:12 +0000 (14:56 -0500)]
CRM-13966 - Migrate mergeTags to use select2

10 years agoMerge pull request #2559 from davecivicrm/CRM-14266
Dave Greenberg [Tue, 25 Feb 2014 17:35:03 +0000 (09:35 -0800)]
Merge pull request #2559 from davecivicrm/CRM-14266

CRM-14266 - include all system FROM emails.

10 years agoCRM-14266 - include all system FROM emails.
Dave Greenberg [Tue, 25 Feb 2014 17:33:29 +0000 (09:33 -0800)]
CRM-14266 - include all system FROM emails.

----------------------------------------
* CRM-14266: send receipt from contrib/event/membership should list all configured FROM email addresses
  http://issues.civicrm.org/jira/browse/CRM-14266

10 years agoCRM-13966 - Remove another unused autocomplete
Coleman Watts [Tue, 25 Feb 2014 15:58:19 +0000 (10:58 -0500)]
CRM-13966 - Remove another unused autocomplete

10 years agoCRM-13966 - Refactor autocomplete from financial acct form
Coleman Watts [Tue, 25 Feb 2014 15:53:31 +0000 (10:53 -0500)]
CRM-13966 - Refactor autocomplete from financial acct form

10 years agoCRM-13966 - Remove unused autocomplete
Coleman Watts [Tue, 25 Feb 2014 15:25:38 +0000 (10:25 -0500)]
CRM-13966 - Remove unused autocomplete

10 years agoCRM-13966 - Improve entityRef default placeholder
Coleman Watts [Tue, 25 Feb 2014 15:23:54 +0000 (10:23 -0500)]
CRM-13966 - Improve entityRef default placeholder

10 years agoCRM-12872 - add necessary js to contribution search
Coleman Watts [Tue, 25 Feb 2014 14:39:31 +0000 (09:39 -0500)]
CRM-12872 - add necessary js to contribution search

10 years agoMerge pull request #2558 from colemanw/eventSelect2
colemanw [Tue, 25 Feb 2014 14:32:23 +0000 (09:32 -0500)]
Merge pull request #2558 from colemanw/eventSelect2

Select2 work

10 years agoCleanup Participant.tpl
Coleman Watts [Tue, 25 Feb 2014 14:25:09 +0000 (09:25 -0500)]
Cleanup Participant.tpl

10 years agoCRM-14270 - Fix UX & performance issues on backend participant form
Coleman Watts [Tue, 25 Feb 2014 14:12:16 +0000 (09:12 -0500)]
CRM-14270 - Fix UX & performance issues on backend participant form

10 years agoCRM-13966 - Allow extra data to be returned with autocomplete results
Coleman Watts [Sun, 23 Feb 2014 18:05:02 +0000 (13:05 -0500)]
CRM-13966 - Allow extra data to be returned with autocomplete results

10 years agoCRM-13966 - Improve select2 description formatting
Coleman Watts [Sun, 23 Feb 2014 14:14:47 +0000 (09:14 -0500)]
CRM-13966 - Improve select2 description formatting

10 years agoCRM-13966 - Migrate event id to select2
Coleman Watts [Sat, 22 Feb 2014 17:13:36 +0000 (12:13 -0500)]
CRM-13966 - Migrate event id to select2

10 years agoCRM-13966 - Migrate event type to select2
Coleman Watts [Sat, 22 Feb 2014 15:55:33 +0000 (10:55 -0500)]
CRM-13966 - Migrate event type to select2

10 years agoCRM-13966 - Fix entityRef/getlist to work with non-id keys
Coleman Watts [Sat, 22 Feb 2014 15:54:44 +0000 (10:54 -0500)]
CRM-13966 - Fix entityRef/getlist to work with non-id keys

10 years agoMerge pull request #2545 from colemanw/tokens
colemanw [Tue, 25 Feb 2014 14:26:22 +0000 (09:26 -0500)]
Merge pull request #2545 from colemanw/tokens

Use select2 for inserting tokens