ilmedova
/
Attendize
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
99 Commits 1 Branch 0 Tags 100 MiB
Commit Graph

99 Commits

Author SHA1 Message Date
Dave fe612b35cb Merge branch 'master' of https://github.com/Attendize/Attendize 
# Conflicts:
#	app/Http/Controllers/EventCustomizeController.php
 2016-03-16 16:53:19 +00:00
Dave Earley 1785b128c4 Merge pull request #44 from markwalet/view_update 
View update
 2016-03-16 16:44:25 +00:00
Dave 9862fb3992 - Fix missing method error when changing event social settings 2016-03-16 16:38:09 +00:00
Mark Walet 1c05b50419 Some more validation fixes 2016-03-16 16:50:22 +01:00
Mark Walet 56de2fe28a Validated and updated html5 markup by validator.w3.org 2016-03-16 16:12:35 +01:00
Mark Walet 0e0ceffbda Small syntax fixes 2016-03-16 16:00:03 +01:00
Mark Walet e1bbc0a176 Refactored ticket edit modal 2016-03-16 15:32:17 +01:00
Mark Walet 7fa69e5a0f Refactor of Ticket index view 2016-03-16 15:25:14 +01:00
Dave a5b40e10df - L5 update work 
- Adding comments
 - Removing unused method in event dashboard model
 2016-03-16 12:51:36 +00:00
Dave Earley 50453a48c4 Merge pull request #42 from markwalet/vendor_update 
Updated vendor config files
 2016-03-16 12:05:08 +00:00
Mark Walet 7566986124 Update event customize view 2016-03-16 12:50:34 +01:00
Mark Walet 1a059ad2d4 Icon class update 2016-03-16 12:48:38 +01:00
Mark Walet 9220ba7068 Updated debug key for wkhtml2pdf 2016-03-16 12:34:38 +01:00
Mark Walet 6d14c574b6 Updated vendor config files 2016-03-16 12:01:18 +01:00
Dave 6cdfd6c9e7 - L5 work 
- Adding comments
 2016-03-16 01:13:49 +00:00
Dave 949fb3f859 - Version bump to v.0.4.0 2016-03-15 01:20:32 +00:00
Dave Earley 88d624d718 Merge pull request #40 from bretto36/layout-fixes 
Layout fixes
 2016-03-14 23:02:35 +00:00
brettninja 2f29e712c3 Search returns unchecked attendee even when marked as has_arrived 2016-03-14 18:15:22 -04:00
brettninja 8bcd992530 Fixed search box display in event check in page 2016-03-14 18:12:24 -04:00
Dave Earley 456fc574d0 Merge pull request #37 from bretto36/remove-duplicate-code 
Removed duplicate refund code when issuing a partial refund
 2016-03-14 19:08:23 +00:00
Dave Earley a05fc4383a Merge pull request #39 from jncampbell/add-some-missing-docblocks 
Adds docblocks to models
 2016-03-14 19:06:12 +00:00
jncampbell c6f01728be Adds docblocks to models 2016-03-14 16:37:38 +00:00
brettninja cd2466d969 Updates, added rounding to fix float comparisons 2016-03-14 03:27:31 -04:00
brettninja a915aa5401 Removed duplicate refund code 2016-03-14 03:14:19 -04:00
Dave Earley 0210beb20b Merge pull request #34 from bretto36/view-cancelled-order 
Viewing cancelled order
 2016-03-13 22:47:43 +00:00
brettninja fb2c056b2a Added git ignore for event_images page 2016-03-12 19:25:10 -05:00
brettninja 8c4cf11c40 Added Refunded Amount to Order Details view 
Removed cancelled tickets from EventTickets View
Corrected first year for CC
 2016-03-12 19:24:48 -05:00
Dave f53ea9bf75 - Changed the 'Resend ticket' functionality slightly so attendees only receive their ticket, and not every ticket on the order. 2016-03-11 15:51:39 +00:00
Dave aa1789166d - Fix bug where affiliate stat updates were applying to multiple events 2016-03-11 12:33:45 +00:00
Dave c582231375 Merge remote-tracking branch 'github/master' 2016-03-11 12:21:13 +00:00
Dave 5be206aaa3 - L5 updates 
- Minor Changes
 2016-03-11 12:17:49 +00:00
Dave Earley 19486d999b Merge pull request #31 from bretto36/resend-ticket-email 
Resend Ticket Email (closed #14)
 2016-03-11 12:04:09 +00:00
brettninja 461c6132b2 Resend Ticket Email 
- Added routes
 - Changed Attendees.blade to add a button group instead of just the
message button. Added message button to button group
 2016-03-10 23:25:15 -05:00
Dave db91c48e7f - Removing unnecessary text 2016-03-11 01:30:44 +00:00
Dave 011c67a78b - Using more Laravel 5 in the Attendee controller 2016-03-11 01:03:33 +00:00
Dave afaf6b8877 - Updated installer to check if the user content directories are writable (issue #26) 2016-03-10 22:59:34 +00:00
Attendize bc0f78f323 Merge pull request #28 from markwalet/config_update 
Config update
 2016-03-10 19:32:30 +00:00
Mark Walet 6b0d38cf9b Syntax update for app config 2016-03-10 14:41:19 +01:00
Mark Walet a99e334065 Added ide-helper dependency 2016-03-10 14:36:51 +01:00
Attendize a69f4801a7 Merge pull request #24 from bretto36/formatting-updates 
Added formatting updates to blade views
 2016-03-10 12:59:22 +00:00
Dave b07a3d49c2 - Committing empty directories to prevent image uploads failing (closes #26) 2016-03-10 12:50:10 +00:00
brettninja 6473554592 Added extra ignore 2016-03-09 23:55:20 -05:00
brettninja 999d1b8394 Added formatting updates to blade views 
- Removed empty class names
 - Removed superfluous blank spaces in class attributes
 - Normalised quotes on Blade files
 - Fixed indenting
 - Normalised some css
 2016-03-09 23:41:10 -05:00
Dave 2a84357bec - Started work on customizable ticket design (issue #18) 2016-03-10 00:41:34 +00:00
Attendize 84d32e177b Merge pull request #21 from markwalet/login_signup_update 
Login signup update
 2016-03-10 00:29:42 +00:00
Mark Walet 37b29d6b50 merge 2016-03-09 23:06:59 +01:00
Mark Walet b318a9dd23 Update for Signup and Login 2016-03-09 23:05:39 +01:00
Mark Walet 6120216257 Updated gitignore for installed file 2016-03-09 23:05:25 +01:00
Attendize 75e997f61b Merge pull request #20 from radiantMoxie/master 
docs: Correct vocabulary in README
 2016-03-09 21:34:51 +00:00
Yana Kesala a628ddc94d docs: Correct vocabulary in README 
Changed "weary" to "wary" because author is cautioning user against production use at this point.
 2016-03-09 13:02:59 -08:00