Dev#340

Open

chintans wants to merge 294 commits intomasterfrom

This pull request is big! We're only showing the most recent 250 commits

Commits on Mar 24, 2017

commit to resolve merge
siddharthashw
committed
TaskMailRepositoryTest.cs - added a new test case
siddharthashw
committed
Merge pull request #318 from Promact/OnOffFunctionalityOfBot
siddharthashw
authored
ConfigurationRepository.cs - repository for Configuration
siddharthashw
committed
AutofacConfig.cs - register ConfigurationRepository
siddharthashw
committed
configuration.component.spec.ts - added test cases for configuration.component.ts
siddharthashw
committed
HomeController.cs - updated the route
siddharthashw
committed
configuration.component.ts - made variable public from private
siddharthashw
committed
Read app credentials fom seed data. Fixes#284

julie
authored and
siddharthashw
committed
Added string constant. Fixes #284

julie
authored and
siddharthashw
committed
Read app credentials fom seed data. Fixes#284

julie
authored and
siddharthashw
committed
Added string constant. Fixes #284

julie
authored and
siddharthashw
committed
ConfigurationRepository.cs - added 2 methods to get app credential and disable app
siddharthashw
committed
configuration.component.ts - added configuration for dialog esc off
siddharthashw
committed
App integration separated out. Fixes#284

julie
authored and
siddharthashw
committed
removed exception. Fixes #282

julie
authored and
siddharthashw
committed
HomeController.cs - separated redirect for redmine and leave slash command
siddharthashw
committed
changed Autopper Configuration for AppCredentials. Added method UpdateBotTokenAsync in AppCredentialRepository. Fixes#282

julie
authored and
siddharthashw
committed
Updated AppCredentialRepository. Fixes#282

julie
authored and
julie
committed
AppCredentialRepository.cs - added a method to Clear BotToken By Module
siddharthashw
committed
Bot user id in App Credentials. Fixes #282

julie
authored and
siddharthashw
committed
IScrumRepository.cs - contain functionality of scrum bot
siddharthashw
committed
Added on and off functionality in SocketClientWrapper
siddharthashw
committed
AutofacConfig.cs - added mock of ISocketWrapper
siddharthashw
committed
AppCredentialRepository.cs - added a method to Clear BotToken By Module
siddharthashw
committed
IScrumRepository.cs - contain functionality of scrum bot
siddharthashw
committed
BotUserId fetched. Fixes#282

julie
authored and
siddharthashw
committed
Rearrange the Follow of bot set up, on and off
siddharthashw
committed
Updated method. Fixes#282

julie
authored and
siddharthashw
committed
Rearranged bot message handling. Fixes#282

julie
authored and
siddharthashw
committed
ITaskMailRepository.cs - remove previous method and make single method to process task mail
siddharthashw
committed
commit to resolve merge
siddharthashw
committed
TaskMailRepositoryTest.cs - added a new test case
siddharthashw
committed
commit to merge
siddharthashw
committed
commit to resolve conflict and error, occured in rebase
siddharthashw
committed

Commits on Apr 4, 2017

Commits on Apr 5, 2017

Commits on Apr 6, 2017

configuration.component.ts - updated tslint issue
siddharthashw
committed

Commits on Apr 7, 2017

updated the routes as per review
siddharthashw
committed
Merge pull request #321 from Promact/Module-Separation
Ankit Bhanvadia
authored
Revert "Module separation"
Ankit Bhanvadia
authored
Merge pull request #322 from Promact/revert-321-Module-Separation
Ankit Bhanvadia
authored
Updated message before adding app to slack. Fixes#319

julie
authored and
julie
committed

Commits on Apr 11, 2017

Merge pull request #323 from Promact/issue#319
Ankit Bhanvadia
authored

Commits on Apr 12, 2017

Commits on Apr 13, 2017

Changes in slack authorize page

asra
authored and
asra
committed
Removed the unused text

asra
authored and
asra
committed
Merge branch 'dev' into updateAuthorizePageDesignIssue
Ankit Bhanvadia
authored
Merge pull request #326 from Promact/Issue-#86
Ankit Bhanvadia
authored
Merge branch 'dev' into updateAuthorizePageDesignIssue
Ankit Bhanvadia
authored

Commits on Apr 14, 2017

re-start build

ankit
authored and
ankit
committed
Merge pull request #327 from Promact/updateAuthorizePageDesignIssue
Ankit Bhanvadia
authored

Commits on Apr 19, 2017

Commits on Apr 20, 2017

update SxrumBotRepository and ScrumSetUpRepository file

ankit
authored and
ankit
committed

Commits on Apr 21, 2017

Merge pull request #331 from Promact/quotesIssue
Ankit Bhanvadia
authored

Commits on Apr 26, 2017

update SlackAuthorize.cshmtl page and also added new logs

ankit
authored and
ankit
committed
added new logger in Scrum Repository.cs

ankit
authored and
ankit
committed
Merge pull request #332 from Promact/designIssueInSlackAuthorizePage
Ankit Bhanvadia
authored

Commits on Apr 27, 2017

CDN related changes

asra
authored and
asra
committed
updated AfterLogin and Index.cshtml file

ankit
authored and
ankit
committed

Commits on Apr 28, 2017

updated erp-custom.css file and also solved AfterLogin.cshtml file .

ankit
authored and
ankit
committed
Merge branch 'dev' into Issue#334
Ankit Bhanvadia
authored
updated css file and also updated font-awesome.min.css file and also updated AfterLogin and Index.cshtml file

ankit
authored and
ankit
committed

Commits on May 1, 2017

Commits on May 2, 2017

Commits on May 3, 2017

Commits on May 8, 2017

added new logger

ankit
authored and
ankit
committed
update appveyor.yml (update yarn version)

ankit
authored and
ankit
committed
Merge pull request #341 from Promact/addedNewLogger
Ankit Bhanvadia
authored
Merge branch 'master' into dev
Ankit Bhanvadia
authored

Commits on May 9, 2017

Commits on May 10, 2017

Commits on May 11, 2017

Commits on May 13, 2017

Merge pull request #347 from Promact/taskmailenhacement
Ankit Bhanvadia
authored

Commits on May 16, 2017

Commits on May 17, 2017

Commits on May 18, 2017

Commits on May 19, 2017

LeaveManagementBotRepository.cs - updated sick leave functionality updation
siddharthashw
committed

Commits on May 20, 2017

Merge pull request #351 from Promact/updateSickFunctionality
Ankit Bhanvadia
authored

Commits on May 22, 2017

Promact.Erp.Web.csproj - configured project in such a way that build.js in included when project is published

siddharthashw
authored and
chintans
committed
Promact.Erp.Web.csproj - configured project in such a way that build.js in included when project is published

siddharthashw
authored and
chintans
committed
Promact.Erp.Web.csproj - removed Promact.ERP.pubxml

siddharthashw
authored and
chintans
committed
Promact.Erp.Web.csproj - removed Promact.ERP.pubxml

siddharthashw
authored and
chintans
committed
added local.pubxml

siddharthashw
authored and
chintans
committed
Promact.Erp.Web.csproj - removed .pubxml contents

siddharthashw
authored and
chintans
committed

Commits on May 24, 2017

MailSettingRepository.cs - added validation for CC

siddharthashw
authored and
chintans
committed

Commits on May 25, 2017

AutoMapperConfiguration.cs - added a configuration for TaskMailDetails and TaskMailDetailsAC

siddharthashw
authored and
chintans
committed

Commits on May 26, 2017

EmailServiceTemplateRepository.cs - added tolower for validation

siddharthashw
authored and
chintans
committed
TaskMailRepository.cs - added validation

siddharthashw
authored and
chintans
committed
commit to rebuild

siddharthashw
authored and
chintans
committed
commit to rebuild

siddharthashw
authored and
chintans
committed

Commits on Jun 13, 2017

OAuthLoginRepository.cs - added functionality to update refreshtoken

Siddhartha
authored and
Siddhartha
committed
Merge pull request #360 from Promact/botrestart
Ankit Bhanvadia
authored

Commits on Jun 14, 2017

IServiceRepository.cs - added new parameter userId in GerAccessTokenByRefreshToken

Siddhartha
authored and
Siddhartha
committed

Commits on Jun 15, 2017

Commits on Jun 16, 2017

Commits on Jun 26, 2017