Commit Graph

655 Commits

Author SHA1 Message Date
Manish Verma
42292945f6 Merge remote-tracking branch 'refs/remotes/origin/arindam-bug-priority'
# Conflicts:

#	resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php
2016-11-06 21:52:57 +05:30
Manish Verma
42b44300e2 Merge pull request #296 from ladybirdweb/analysis-zO5wb4
Applied fixes from StyleCI
2016-11-04 18:33:30 +05:30
Manish Verma
30c5a8ec2a Applied fixes from StyleCI 2016-11-04 13:03:00 +00:00
Manish Verma
775e0561d8 Merge remote-tracking branch 'refs/remotes/origin/master' into arindam-bug-priority 2016-11-04 18:23:31 +05:30
arindam85
e4b9755294 arindam-priority-complie 2016-11-04 16:27:24 +05:30
arindam85
c05917583b comm-priority-complite 2016-11-04 16:14:15 +05:30
Manish Verma
0243ce3711 Merge pull request #294 from ladybirdweb/analysis-8mrlQW
Applied fixes from StyleCI
2016-11-04 15:36:40 +05:30
Manish Verma
5df5eddf00 Applied fixes from StyleCI 2016-11-04 10:06:19 +00:00
Manish Verma
aab529edbd bug-fix-patch-17
*Solved bug for attachement rendering in tickets.
2016-11-04 15:34:02 +05:30
Manish Verma
8eb78ef348 Bug-fix-patch-16
Starting count for bug patch so numbered this pacth as 16 (I hope we've
commit atleast 15 bug fixes till now)
Solved bugs:
*While replying on a ticket as an agent subject of a mail is getting
changed which results in new mail thread creation in emails.
*Ticket title sometimes get replaced by ''(an empty string) because
sometimes it fetches last created thread as first row and it my not have
the subject/title. So tried to fetch only first row which contains
subjetc of the tickets.
2016-11-04 14:27:56 +05:30
Manish Verma
57efc24003 email-configuration-bug-fix-patch
Installed "tedivm/fetch": "0.6.*" package to configure email fetcing.
2016-11-04 11:15:57 +05:30
Manish Verma
7fecdb1df9 Bug-fix-patch
Database update for priority bug fix.
2016-11-03 18:28:23 +05:30
Manish Verma
8c6b314499 Bug-fix-patch
Fixed bugs for priority and email exception throw.
2016-11-03 18:01:39 +05:30
Manish Verma
964353bc1e Merge pull request #293 from ladybirdweb/analysis-XkrxL1
Applied fixes from StyleCI
2016-11-03 16:54:39 +05:30
Manish Verma
fbea06a902 Applied fixes from StyleCI 2016-11-03 11:23:33 +00:00
Manish Verma
bb5b3131e2 Profile-edit-bug-fix-patch
Agent Profile update bug fixed for cheking unique mobile numbers
2016-11-03 16:46:47 +05:30
Manish Verma
ca32203d6f Package-update-patch
Update Torann/GeoIP package from 0.2 to 1.0.0 which is being used to
show country code in phone nuber in various forms.
2016-11-03 15:28:03 +05:30
Manish Verma
580479f087 updates for PHP verison
Updated readme and travis for PHP version requirement
2016-11-03 06:05:36 +05:30
Manish Verma
cdf6b41357 Package-installation-patch
Reinstalled Unisharp/Ckeditor package
2016-11-03 05:57:14 +05:30
Manish Verma
5d49d384a0 composer-update-patch 2016-11-03 05:44:29 +05:30
Manish Verma
2dca47f5a4 Merge pull request #292 from ladybirdweb/analysis-8Qen4g
Applied fixes from StyleCI
2016-11-03 10:24:05 +05:30
Manish Verma
826057500b Applied fixes from StyleCI 2016-11-03 04:53:51 +00:00
Vijay Sebastian
0bc1e99fab Unread criteria, iframe reload issue, attachment issue and replace example email with username 2016-11-03 10:10:58 +05:30
Manish Verma
dbb118b004 Bug-fix-patch
chaged 'user/settings/priority'  to 'user_settings_priority' in ajax
call
2016-11-02 17:35:38 +05:30
arindam85
43af1ef280 Revert "only actuve user can chose priority -1"
This reverts commit 34860b407a.
2016-10-31 18:30:14 +05:30
arindam85
34860b407a only actuve user can chose priority -1
only active priority is showing in ticket edit page and email setting
page
2016-10-31 18:00:08 +05:30
arindam85
1a8d75e8de active priority
only active priority is showing in ticket edit page and email setting
page
2016-10-31 15:13:53 +05:30
arindam85
53868f5c07 only actuve user can chose priority 2016-10-31 14:08:39 +05:30
Manish Verma
6ff84612b5 Merge remote-tracking branch 'refs/remotes/origin/master' into arindam-bug-priority 2016-10-31 13:14:50 +05:30
Manish Verma
ed5231a52b updates
updated system priorities color.
2016-10-31 13:14:19 +05:30
Manish Verma
91dacdd998 bug-fix-patch 2016-10-31 13:06:39 +05:30
Manish Verma
6a06167063 Merge pull request #284 from ladybirdweb/arindam-bug-priority
priority add tooltip and change url
2016-10-31 13:05:37 +05:30
Manish Verma
6d7db018d3 Merge pull request #285 from ladybirdweb/analysis-qgKlQ5
Applied fixes from StyleCI
2016-10-31 13:05:13 +05:30
Manish Verma
3383e38bed Applied fixes from StyleCI 2016-10-31 07:34:48 +00:00
arindam85
5f57c884b0 priority add tooltipand change url 2016-10-31 13:00:36 +05:30
Manish Verma
46a9534679 Merge pull request #270 from gillidandaweb/master
Changes to grammar, spelling and capitalization within sentences
2016-10-30 09:21:42 +05:30
Manish Verma
5e82a3331f Merge pull request #277 from ladybirdweb/arindam-bugg
remove email from demo data
2016-10-28 16:06:40 +05:30
Manish Verma
77441f9119 Bug fix patch
removed dummy email data from emails table in dummy data and demo data
2016-10-28 16:02:47 +05:30
Manish Verma
a348004e08 Merge remote-tracking branch 'refs/remotes/origin/master' into arindam-bugg 2016-10-28 13:19:10 +05:30
Manish Verma
5a3ef4d5dc Bug fix patch
added javascript reload in agent profile show for edit organization
2016-10-28 13:18:13 +05:30
Manish Verma
477fa1b8f7 Bug-fix patch
removed hypelink with no existing route from agent layout.
2016-10-28 12:54:22 +05:30
Manish Verma
5ecafc2188 Merge remote-tracking branch 'refs/remotes/origin/master' into arindam-bugg 2016-10-28 12:18:49 +05:30
Manish Verma
6509303974 Merge remote-tracking branch 'refs/remotes/origin/arindam-bugg'
# Conflicts:
#	app/Http/Controllers/Agent/helpdesk/UserController.php
#	resources/lang/en/lang.php
2016-10-28 12:17:58 +05:30
Manish Verma
637a853c92 Merge pull request #275 from ladybirdweb/analysis-zO5eYk
Applied fixes from StyleCI
2016-10-27 16:46:33 +05:30
Manish Verma
2a57341212 Applied fixes from StyleCI 2016-10-27 11:16:23 +00:00
Manish Verma
8b374bb5ce Bug-fix patch 2016-10-27 16:45:11 +05:30
Fraser Murray
ae2fd3deaf Changes to grammar, spelling and capitalization within sentences 2016-10-26 14:40:27 +00:00
Manish Verma
f7030a1ecd Merge pull request #269 from ladybirdweb/analysis-8wWbO4
Applied fixes from StyleCI
2016-10-26 13:18:57 +05:30
Manish Verma
c2940bcc04 Applied fixes from StyleCI 2016-10-26 07:48:34 +00:00
arindam85
7aec2427ea edit organization arindam 2016-10-26 13:13:09 +05:30