WP-Plugins/glm-member-db-events.git
8 years agoMerge branch 'develop' into hotfix/1.2.7
Laury GvR [Tue, 21 Jun 2016 15:38:43 +0000 (11:38 -0400)]
Merge branch 'develop' into hotfix/1.2.7

8 years agoDefault ref_type to 10 for now, always
Laury GvR [Tue, 21 Jun 2016 15:38:31 +0000 (11:38 -0400)]
Default ref_type to 10 for now, always

8 years agoMerge tag 'v1.2.8' into develop
Laury GvR [Tue, 21 Jun 2016 13:17:32 +0000 (09:17 -0400)]
Merge tag 'v1.2.8' into develop

v1.2.8

8 years agoMerge branch 'release/1.2.8' v1.2.8
Laury GvR [Tue, 21 Jun 2016 13:17:27 +0000 (09:17 -0400)]
Merge branch 'release/1.2.8'

8 years agoVersion bump
Laury GvR [Tue, 21 Jun 2016 13:17:14 +0000 (09:17 -0400)]
Version bump

8 years agoFixed problem with all/none not being detected as a change and therefore recurrence...
Chuck Scott [Mon, 20 Jun 2016 18:40:29 +0000 (14:40 -0400)]
Fixed problem with all/none not being detected as a change and therefore recurrence not being stored.

8 years agoMerge tag 'v1.2.7' into develop
Steve Sutton [Mon, 20 Jun 2016 16:37:34 +0000 (12:37 -0400)]
Merge tag 'v1.2.7' into develop

Version 1.2.7

8 years agoMerge branch 'hotfix/1.2.7' v1.2.7
Steve Sutton [Mon, 20 Jun 2016 16:37:26 +0000 (12:37 -0400)]
Merge branch 'hotfix/1.2.7'

8 years agoUpdate the search to deal with single quotes
Steve Sutton [Mon, 20 Jun 2016 16:36:56 +0000 (12:36 -0400)]
Update the search to deal with single quotes

the filter is adding the slashes.

8 years agoMerge branch 'hotfix/1.2.7' into develop
Laury GvR [Fri, 17 Jun 2016 21:11:12 +0000 (17:11 -0400)]
Merge branch 'hotfix/1.2.7' into develop

8 years agoOnly show member detail if it's checked
Laury GvR [Fri, 17 Jun 2016 21:09:30 +0000 (17:09 -0400)]
Only show member detail if it's checked

8 years agoReworked how we're checking for our rewrite rules and flusing the cache.
Chuck Scott [Fri, 17 Jun 2016 19:30:52 +0000 (15:30 -0400)]
Reworked how we're checking for our rewrite rules and flusing the cache.

8 years agoMerge tag 'v1.2.6' into develop
Steve Sutton [Fri, 17 Jun 2016 15:18:06 +0000 (11:18 -0400)]
Merge tag 'v1.2.6' into develop

Version 1.2.6

8 years agoMerge branch 'hotfix/1.2.6' v1.2.6
Steve Sutton [Fri, 17 Jun 2016 15:17:56 +0000 (11:17 -0400)]
Merge branch 'hotfix/1.2.6'

8 years agoCorrection for the time zone
Steve Sutton [Fri, 17 Jun 2016 15:17:15 +0000 (11:17 -0400)]
Correction for the time zone

Should just use the current time given and not adjust the time zone

8 years agorevert flush_rules change
Chuck Scott [Fri, 17 Jun 2016 14:12:54 +0000 (10:12 -0400)]
revert flush_rules change

8 years agoMerge tag 'v1.2.5' into develop
Steve Sutton [Thu, 16 Jun 2016 18:40:37 +0000 (14:40 -0400)]
Merge tag 'v1.2.5' into develop

Verlsion 1.2.5

8 years agoMerge branch 'release/1.2.5' v1.2.5
Steve Sutton [Thu, 16 Jun 2016 18:40:30 +0000 (14:40 -0400)]
Merge branch 'release/1.2.5'

8 years agobump the version number
Steve Sutton [Thu, 16 Jun 2016 18:40:11 +0000 (14:40 -0400)]
bump the version number

for the index page

8 years agoUpdate the time.ly import again
Steve Sutton [Thu, 16 Jun 2016 18:38:05 +0000 (14:38 -0400)]
Update the time.ly import again

Need to initalize the $stamp variable for each new event.

8 years agoCommented out flush_rules() as it was clearing rewrite rules - need to investigate
Chuck Scott [Thu, 16 Jun 2016 18:27:17 +0000 (14:27 -0400)]
Commented out flush_rules() as it was clearing rewrite rules - need to investigate

8 years agoMerge tag 'v1.2.4' into develop
Steve Sutton [Thu, 16 Jun 2016 17:32:13 +0000 (13:32 -0400)]
Merge tag 'v1.2.4' into develop

Version 1.2.4

8 years agoMerge branch 'hotfix/1.2.4' v1.2.4
Steve Sutton [Thu, 16 Jun 2016 17:32:07 +0000 (13:32 -0400)]
Merge branch 'hotfix/1.2.4'

8 years agoUpdate for time.ly event import
Steve Sutton [Thu, 16 Jun 2016 17:31:26 +0000 (13:31 -0400)]
Update for time.ly event import

If the event has special dates we need to set the starting and ending
dates to the first custom date.

8 years agoMerge tag 'v1.2.3' into develop
Steve Sutton [Thu, 16 Jun 2016 16:13:51 +0000 (12:13 -0400)]
Merge tag 'v1.2.3' into develop

Version 1.2.3

8 years agoMerge branch 'hotfix/1.2.3' v1.2.3
Steve Sutton [Thu, 16 Jun 2016 16:13:43 +0000 (12:13 -0400)]
Merge branch 'hotfix/1.2.3'

8 years agoUpdate time.ly import script
Steve Sutton [Thu, 16 Jun 2016 16:13:11 +0000 (12:13 -0400)]
Update time.ly import script

If the event has custom dates then keep the end date same as start.

8 years agoAdd req fields for logged in members
Steve Sutton [Thu, 16 Jun 2016 15:16:32 +0000 (11:16 -0400)]
Add req fields for logged in members

Should work for the administrative fields to make them required.

8 years agoMerge tag 'v1.2.2' into develop
Steve Sutton [Thu, 16 Jun 2016 14:28:28 +0000 (10:28 -0400)]
Merge tag 'v1.2.2' into develop

Version 1.2.2

8 years agoMerge branch 'hotfix/1.2.2' v1.2.2
Steve Sutton [Thu, 16 Jun 2016 14:28:21 +0000 (10:28 -0400)]
Merge branch 'hotfix/1.2.2'

8 years agoMade the admin contact for edit event not required
Steve Sutton [Thu, 16 Jun 2016 14:27:23 +0000 (10:27 -0400)]
Made the admin contact for edit event not required

We will need to put in the logic to detect if a member is editing the
event and require the fields there.

8 years agoMerge tag 'v1.2.1' into develop
Steve Sutton [Wed, 15 Jun 2016 14:12:35 +0000 (10:12 -0400)]
Merge tag 'v1.2.1' into develop

Version 1.2.1

8 years agoMerge branch 'hotfix/1.2.1' v1.2.1
Steve Sutton [Wed, 15 Jun 2016 14:12:26 +0000 (10:12 -0400)]
Merge branch 'hotfix/1.2.1'

8 years agoHotfix for pdf output issue
Steve Sutton [Wed, 15 Jun 2016 14:11:41 +0000 (10:11 -0400)]
Hotfix for pdf output issue

When the daysOfWeek are all days just remove them from showing

8 years agoMerge tag 'v1.2.0' into develop
Laury GvR [Wed, 15 Jun 2016 13:59:06 +0000 (09:59 -0400)]
Merge tag 'v1.2.0' into develop

v1.2.0

8 years agoMerge branch 'hotfix/1.2.0' v1.2.0
Laury GvR [Wed, 15 Jun 2016 13:58:59 +0000 (09:58 -0400)]
Merge branch 'hotfix/1.2.0'

8 years agoNew version number on account of two new features!
Laury GvR [Wed, 15 Jun 2016 13:58:54 +0000 (09:58 -0400)]
New version number on account of two new features!

8 years agoMerge tag 'v1.0.18' into develop
Laury GvR [Wed, 15 Jun 2016 13:53:44 +0000 (09:53 -0400)]
Merge tag 'v1.0.18' into develop

v1.0.18

8 years agoMerge branch 'hotfix/1.0.18' v1.0.18
Laury GvR [Wed, 15 Jun 2016 13:53:39 +0000 (09:53 -0400)]
Merge branch 'hotfix/1.0.18'

8 years agoFixed a style error causing the css to not display, added a curly bracket
Laury GvR [Wed, 15 Jun 2016 13:53:35 +0000 (09:53 -0400)]
Fixed a style error causing the css to not display, added a curly bracket

8 years agoMerge tag 'v1.0.17' into develop
Laury GvR [Wed, 15 Jun 2016 13:46:43 +0000 (09:46 -0400)]
Merge tag 'v1.0.17' into develop

v1.0.17

8 years agoMerge branch 'release/1.0.17' v1.0.17
Laury GvR [Wed, 15 Jun 2016 13:46:38 +0000 (09:46 -0400)]
Merge branch 'release/1.0.17'

8 years agoVersion bump
Laury GvR [Wed, 15 Jun 2016 13:46:33 +0000 (09:46 -0400)]
Version bump

8 years agoMerge branch 'feature/frontpage' into develop
Laury GvR [Wed, 15 Jun 2016 13:45:08 +0000 (09:45 -0400)]
Merge branch 'feature/frontpage' into develop

Conflicts:
css/front.css

8 years agoFrontpage event styling made like Timely
Laury GvR [Wed, 15 Jun 2016 13:43:58 +0000 (09:43 -0400)]
Frontpage event styling made like Timely

8 years agoAdditional user interface cleanup
Chuck Scott [Mon, 13 Jun 2016 17:37:08 +0000 (13:37 -0400)]
Additional user interface cleanup

8 years agoMerge tag 'v1.0.16' into develop
Laury GvR [Mon, 13 Jun 2016 17:42:31 +0000 (13:42 -0400)]
Merge tag 'v1.0.16' into develop

v1.0.16

8 years agoMerge branch 'hotfix/1.0.16' v1.0.16
Laury GvR [Mon, 13 Jun 2016 17:42:25 +0000 (13:42 -0400)]
Merge branch 'hotfix/1.0.16'

8 years agoEvent list search area restyled
Laury GvR [Mon, 13 Jun 2016 17:42:21 +0000 (13:42 -0400)]
Event list search area restyled

8 years agoWorking on a new template for front page events feature/frontpage
Steve Sutton [Fri, 10 Jun 2016 18:55:00 +0000 (14:55 -0400)]
Working on a new template for front page events

This is to have an output similar to the time.ly front page shortcode
that we are using for mountpleasant right now.

8 years agoMerge tag 'v1.0.15' into develop
Anthony Talarico [Thu, 9 Jun 2016 15:16:07 +0000 (11:16 -0400)]
Merge tag 'v1.0.15' into develop

adjusted styles for events detail modal map dialog

8 years agoMerge branch 'hotfix/1.0.15' v1.0.15
Anthony Talarico [Thu, 9 Jun 2016 15:15:49 +0000 (11:15 -0400)]
Merge branch 'hotfix/1.0.15'

8 years agoadjusted styles for jquery dialog ui for modal map on events detail page
Anthony Talarico [Thu, 9 Jun 2016 15:15:22 +0000 (11:15 -0400)]
adjusted styles for jquery dialog ui for modal map on events detail page

8 years agoSome small edits for intro field
Steve Sutton [Thu, 9 Jun 2016 12:10:59 +0000 (08:10 -0400)]
Some small edits for intro field

Switch to using mb_substr. Normal substr caused some errors when
importing the events. Also I am going 25 events at a time. The variable
for this is just inside of the function for adding timely events.

8 years agoMerge branch 'feature/timelyAnthony' into develop
Anthony Talarico [Wed, 8 Jun 2016 15:43:33 +0000 (11:43 -0400)]
Merge branch 'feature/timelyAnthony' into develop

8 years agoFixed bad dates in events list when no times entries
Chuck Scott [Wed, 8 Jun 2016 14:53:13 +0000 (10:53 -0400)]
Fixed bad dates in events list when no times entries

8 years agoAdding to end date for recurring events feature/timelyAnthony
Steve Sutton [Wed, 8 Jun 2016 14:51:24 +0000 (10:51 -0400)]
Adding to end date for recurring events

If the event has $recurring_event set to true and the from and to dates
are the same then adjust the end date to 2 years out.

8 years agoadded more logic for weekly intervals, daily intervals and specific days of the month
Anthony Talarico [Tue, 7 Jun 2016 20:30:27 +0000 (16:30 -0400)]
added more logic for weekly intervals, daily intervals and specific days of the month

8 years agoUpdated index.php to show current tag number
Chuck Scott [Tue, 7 Jun 2016 17:12:14 +0000 (13:12 -0400)]
Updated index.php to show current tag number

8 years agoMade compatible with receint changes to database setup proceedures
Chuck Scott [Tue, 7 Jun 2016 17:09:21 +0000 (13:09 -0400)]
Made compatible with receint changes to database setup proceedures

8 years agotimely import functions
Anthony Talarico [Mon, 6 Jun 2016 19:21:19 +0000 (15:21 -0400)]
timely import functions

8 years agoMinor fix
Chuck Scott [Thu, 2 Jun 2016 20:09:05 +0000 (16:09 -0400)]
Minor fix

8 years agoAdded counters to some text fields, fixed some phone fields, other changes
Chuck Scott [Thu, 2 Jun 2016 17:18:11 +0000 (13:18 -0400)]
Added counters to some text fields, fixed some phone fields, other changes

8 years agoMerge tag 'v1.0.14' into develop all
Anthony Talarico [Wed, 1 Jun 2016 14:18:03 +0000 (10:18 -0400)]
Merge tag 'v1.0.14' into develop

removing echo statements

8 years agoMerge branch 'hotfix/1.0.14' v1.0.14
Anthony Talarico [Wed, 1 Jun 2016 14:17:57 +0000 (10:17 -0400)]
Merge branch 'hotfix/1.0.14'

8 years agoremoving echo statement
Anthony Talarico [Wed, 1 Jun 2016 14:17:38 +0000 (10:17 -0400)]
removing echo statement

8 years agoMerge tag 'v1.0.13' into develop
Anthony Talarico [Wed, 1 Jun 2016 14:15:17 +0000 (10:15 -0400)]
Merge tag 'v1.0.13' into develop

fixing reply to header

8 years agoMerge branch 'hotfix/1.0.13' v1.0.13
Anthony Talarico [Wed, 1 Jun 2016 14:15:09 +0000 (10:15 -0400)]
Merge branch 'hotfix/1.0.13'

8 years agotrying to add reply to in the headers
Anthony Talarico [Wed, 1 Jun 2016 14:14:50 +0000 (10:14 -0400)]
trying to add reply to in the headers

8 years agoMerge tag 'v1.0.12' into develop
Anthony Talarico [Wed, 1 Jun 2016 13:56:07 +0000 (09:56 -0400)]
Merge tag 'v1.0.12' into develop

added reply-to field using contact email from event form

8 years agoMerge branch 'hotfix/1.0.12' v1.0.12
Anthony Talarico [Wed, 1 Jun 2016 13:55:54 +0000 (09:55 -0400)]
Merge branch 'hotfix/1.0.12'

8 years agoadded reply-to field using contact email on form
Anthony Talarico [Wed, 1 Jun 2016 13:55:30 +0000 (09:55 -0400)]
added reply-to field using contact email on form

8 years agoMerge tag 'v1.0.11' into develop
Anthony Talarico [Wed, 1 Jun 2016 13:22:47 +0000 (09:22 -0400)]
Merge tag 'v1.0.11' into develop

added wrapping for optional notification message

8 years agoMerge branch 'hotfix/1.0.11' v1.0.11
Anthony Talarico [Wed, 1 Jun 2016 13:22:36 +0000 (09:22 -0400)]
Merge branch 'hotfix/1.0.11'

8 years agoadded line wrapping for optional notification message
Anthony Talarico [Wed, 1 Jun 2016 13:22:15 +0000 (09:22 -0400)]
added line wrapping for optional notification message

8 years agoMerge tag 'v1.0.10' into develop
Anthony Talarico [Wed, 1 Jun 2016 13:06:09 +0000 (09:06 -0400)]
Merge tag 'v1.0.10' into develop

removed bold style for table pair values

8 years agoMerge branch 'hotfix/1.0.10' v1.0.10
Anthony Talarico [Wed, 1 Jun 2016 13:05:54 +0000 (09:05 -0400)]
Merge branch 'hotfix/1.0.10'

8 years agochanging email styles, removing bold for table values
Anthony Talarico [Wed, 1 Jun 2016 13:05:16 +0000 (09:05 -0400)]
changing email styles, removing bold for table values

8 years agoMerge tag 'v1.0.9' into develop
Anthony Talarico [Tue, 31 May 2016 21:01:13 +0000 (17:01 -0400)]
Merge tag 'v1.0.9' into develop

cleaned table structure for email table

8 years agoMerge branch 'hotfix/1.0.9' v1.0.9
Anthony Talarico [Tue, 31 May 2016 21:01:04 +0000 (17:01 -0400)]
Merge branch 'hotfix/1.0.9'

8 years agocleaned table structure for fields
Anthony Talarico [Tue, 31 May 2016 21:00:47 +0000 (17:00 -0400)]
cleaned table structure for fields

8 years agoMerge tag 'v1.0.8' into develop
Anthony Talarico [Tue, 31 May 2016 20:49:04 +0000 (16:49 -0400)]
Merge tag 'v1.0.8' into develop

fixing syntax errors

8 years agoMerge branch 'hotfix/1.0.8' v1.0.8
Anthony Talarico [Tue, 31 May 2016 20:48:56 +0000 (16:48 -0400)]
Merge branch 'hotfix/1.0.8'

8 years agofixing syntax error
Anthony Talarico [Tue, 31 May 2016 20:48:35 +0000 (16:48 -0400)]
fixing syntax error

8 years agoMerge tag 'v1.0.7' into develop
Anthony Talarico [Tue, 31 May 2016 20:41:04 +0000 (16:41 -0400)]
Merge tag 'v1.0.7' into develop

fixing time format for email template display

8 years agoMerge branch 'hotfix/1.0.7' v1.0.7
Anthony Talarico [Tue, 31 May 2016 20:40:48 +0000 (16:40 -0400)]
Merge branch 'hotfix/1.0.7'

8 years agofixing times format for email notification
Anthony Talarico [Tue, 31 May 2016 20:40:11 +0000 (16:40 -0400)]
fixing times format for email notification

8 years agoMerge tag 'v1.0.6' into develop
Anthony Talarico [Tue, 31 May 2016 20:30:20 +0000 (16:30 -0400)]
Merge tag 'v1.0.6' into develop

adding table styles to email

8 years agoMerge branch 'hotfix/1.0.6' v1.0.6
Anthony Talarico [Tue, 31 May 2016 20:30:11 +0000 (16:30 -0400)]
Merge branch 'hotfix/1.0.6'

8 years agoadding table style to email
Anthony Talarico [Tue, 31 May 2016 20:29:53 +0000 (16:29 -0400)]
adding table style to email

8 years agoMerge tag 'v1.0.5' into develop
Anthony Talarico [Tue, 31 May 2016 19:33:51 +0000 (15:33 -0400)]
Merge tag 'v1.0.5' into develop

overriding wordpress default FROM header

8 years agoMerge branch 'hotfix/1.0.5' v1.0.5
Anthony Talarico [Tue, 31 May 2016 19:33:38 +0000 (15:33 -0400)]
Merge branch 'hotfix/1.0.5'

8 years agooverriding default wordpress FROM header
Anthony Talarico [Tue, 31 May 2016 19:33:18 +0000 (15:33 -0400)]
overriding default wordpress FROM header

8 years agoMerge tag 'v1.0.4' into develop
Anthony Talarico [Tue, 31 May 2016 19:08:43 +0000 (15:08 -0400)]
Merge tag 'v1.0.4' into develop

added more email style

8 years agoMerge branch 'hotfix/1.0.4' v1.0.4
Anthony Talarico [Tue, 31 May 2016 19:08:35 +0000 (15:08 -0400)]
Merge branch 'hotfix/1.0.4'

8 years agoadded more style to email
Anthony Talarico [Tue, 31 May 2016 19:08:15 +0000 (15:08 -0400)]
added more style to email

8 years agoMerge tag 'v1.0.3' into develop
Anthony Talarico [Tue, 31 May 2016 18:51:59 +0000 (14:51 -0400)]
Merge tag 'v1.0.3' into develop

added style to email and date

8 years agoMerge branch 'hotfix/1.0.3' v1.0.3
Anthony Talarico [Tue, 31 May 2016 18:51:51 +0000 (14:51 -0400)]
Merge branch 'hotfix/1.0.3'

8 years agoadded date to email and basic styles
Anthony Talarico [Tue, 31 May 2016 18:51:34 +0000 (14:51 -0400)]
added date to email and basic styles

8 years agoMerge tag 'v1.0.2' into develop
Anthony Talarico [Tue, 31 May 2016 17:34:41 +0000 (13:34 -0400)]
Merge tag 'v1.0.2' into develop

adding email notification management section and html notification formatting