Commits · 44f09bc2c434cebc5d77a482f4b59f604d66780f · Administrator / AloqaIM-Android

27 Dec, 2017 17 commits
- Merge branch 'develop-2.x' into feature/show-chat-list-using-sdk · 44f09bc2
  Filipe de Lima Brito authored Dec 27, 2017
  
  44f09bc2
- Fix merge conflict. · b3fe7461
  Filipe de Lima Brito authored Dec 27, 2017
  
  b3fe7461
- Merge branch 'layout/finishing-authentication-screens' into feature/show-chat-list-using-sdk · d054236a
  Filipe de Lima Brito authored Dec 27, 2017
  
  d054236a
- Inject app context and add listener · 3a1d532d
  Filipe de Lima Brito authored Dec 27, 2017
  
  3a1d532d
- Add functions. · 25d27da0
  Filipe de Lima Brito authored Dec 27, 2017
  
  25d27da0
- Code formatting. · ffa849ce
  Filipe de Lima Brito authored Dec 27, 2017
  
  ffa849ce
- Add context parameter. · ea0781b5
  Filipe de Lima Brito authored Dec 27, 2017
  
  ea0781b5
- Rename function. · 855167d7
  Filipe de Lima Brito authored Dec 27, 2017
  
  855167d7
- Remove unnecessary "this". · 3fa2133c
  Filipe de Lima Brito authored Dec 27, 2017
  
  3fa2133c
- Set text_new_to_rocket_chat TextView below password field. · c7c6611c
  Filipe de Lima Brito authored Dec 27, 2017
  
  c7c6611c
- Add textColorLink and remove text. · 75258b69
  Filipe de Lima Brito authored Dec 27, 2017
  
  75258b69
- Update strings. · 71b5e511
  Filipe de Lima Brito authored Dec 27, 2017
  
  71b5e511
- Add strings · 248f1e7f
  Filipe de Lima Brito authored Dec 27, 2017
  
  248f1e7f
- Add statusBarColor item. · e77eeb39
  Filipe de Lima Brito authored Dec 27, 2017
  
  e77eeb39
- Add drawable. · 62d2c94c
  Filipe de Lima Brito authored Dec 27, 2017
  
  62d2c94c
- Add TextHelper.kt · 0f0fb735
  Filipe de Lima Brito authored Dec 27, 2017
  
  0f0fb735
- Add WebViewActivity.kt · cdb60db5
  Filipe de Lima Brito authored Dec 27, 2017
  
  cdb60db5
26 Dec, 2017 23 commits
- Fix sdk path, disable multidex · f245c5d0
  Lucio Maciel authored Dec 26, 2017
  
  f245c5d0
- Code formatting... · 1004d958
  Filipe de Lima Brito authored Dec 26, 2017
  
  1004d958
- Update TwoFAFragmentProvider.kt · fef70381
  Filipe de Lima Brito authored Dec 26, 2017
  
  fef70381
- Update ActivityBuilder.kt · 3e5a772e
  Filipe de Lima Brito authored Dec 26, 2017
  
  3e5a772e
- Add and delete imports. · a6382451
  Filipe de Lima Brito authored Dec 26, 2017
  
  a6382451
- Update di/SignupFragmentProvider.kt · 8d903957
  Filipe de Lima Brito authored Dec 26, 2017
  
  8d903957
- Code formatting... · 7d0fb5ca
  Filipe de Lima Brito authored Dec 26, 2017
  
  7d0fb5ca
- Update import and variable declaration. · 05b4400f
  Filipe de Lima Brito authored Dec 26, 2017
  
  05b4400f
- Update AndroidManifest.xml · c59f2ecf
  Filipe de Lima Brito authored Dec 26, 2017
  
  c59f2ecf
- Delete MainActivity.kt · 6bd3710b
  Filipe de Lima Brito authored Dec 26, 2017
  
  6bd3710b
- Add MainActivity.kt · bccfa6df
  Filipe de Lima Brito authored Dec 26, 2017
  
  bccfa6df
- Add ChatRoomsFragment.kt · ce0e99df
  Filipe de Lima Brito authored Dec 26, 2017
  
  ce0e99df
- Add ChatRoomsAdapter.kt · 2c119f79
  Filipe de Lima Brito authored Dec 26, 2017
  
  2c119f79
- Add ChatRoomsView.kt · 84e2231c
  Filipe de Lima Brito authored Dec 26, 2017
  
  84e2231c
- Add ChatRoomsPresenter.kt · 5b5656e4
  Filipe de Lima Brito authored Dec 26, 2017
  
  5b5656e4
- Add di/ChatRoomsFragmentProvider.kt · 0d404d45
  Filipe de Lima Brito authored Dec 26, 2017
  
  0d404d45
- Add di/ChatRoomsFragmentModule.kt · 0001a75f
  Filipe de Lima Brito authored Dec 26, 2017
  
  0001a75f
- Update import · 6a658e33
  Filipe de Lima Brito authored Dec 26, 2017
  
  6a658e33
- Delete ChatListFragment.kt · 8592ffc7
  Filipe de Lima Brito authored Dec 26, 2017
  
  8592ffc7
- Delete ChatListAdapter.kt · 2bd5be8f
  Filipe de Lima Brito authored Dec 26, 2017
  
  2bd5be8f
- Delete Chat.kt · 8ea80f2c
  Filipe de Lima Brito authored Dec 26, 2017
  
  8ea80f2c
- Code formating... · 54ab5d21
  Filipe de Lima Brito authored Dec 26, 2017
  
  54ab5d21
- Add fragment_chat_rooms.xml · fe4b1aa2
  Filipe de Lima Brito authored Dec 26, 2017
  
  fe4b1aa2