Commits · 0ccaa6df34a519f2ea88f156e68a2d5cec4fe279 · RocketChat / Rocket.Chat · GitLab

Snippets Groups Projects

Mar 11, 2016
- oAuth -> OAuth · 0ccaa6df
  Gabriel Engel authored 9 years ago
  
  0ccaa6df
- Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into develop · 26ea3ffe
  Gabriel Engel authored 9 years ago
  
  26ea3ffe
- Organize settings · d1ed8b8d
  Gabriel Engel authored 9 years ago
  
  d1ed8b8d
- Merge pull request #2476 from RocketChat/otr · ff719e41
  Gabriel Engel authored 9 years ago
  
  OTR - Rocket.Chat version
  ff719e41
- Enables notification by displaying "Encrypted message" instead of the hash or the actual message · f018846d
  Marcelo Schmidt authored 9 years ago
  
  f018846d
- remove KADIRA_APP_SECRET settings · a71f9d7c
  Gabriel Engel authored 9 years ago
  
  a71f9d7c
- Gitlab -> GitLab · 8ef18371
  Gabriel Engel authored 9 years ago
  
  8ef18371
- Adds functionality to the Refresh button; fixes end button. · 402bcaf2
  Marcelo Schmidt authored 9 years ago
  
  402bcaf2
- Merge pull request #2474 from RocketChat/organize-gitlab-settings · d414c386
  Gabriel Engel authored 9 years ago
  
  Organize Gitlab settings
  d414c386
- Organize Gitlab settings · 0179c07c
  Gabriel Engel authored 9 years ago
  
  0179c07c
- Merge branch 'develop' into otr · d3fe72b5
  Marcelo Schmidt authored 9 years ago
  
  Conflicts: packages/rocketchat-ui/lib/chatMessages.coffee
  d3fe72b5
- Adds message too long error · ab87c7e5
  Marcelo Schmidt authored 9 years ago
  
  ab87c7e5
- Stops using tmeasday:errors and use toastr instead · cacbabd2
  Marcelo Schmidt authored 9 years ago
  
  cacbabd2
- New implementation of OTR as per @mitar's suggestion on #36 · 722469a4
  Marcelo Schmidt authored 9 years ago
  
  722469a4
- no message · a3f40646
  Marcelo Schmidt authored 9 years ago
  
  a3f40646
Mar 10, 2016
- Merge pull request #2470 from RocketChat/send-button · 764afdc1
  Gabriel Engel authored 9 years ago
  
  shows a send button if there is a message in the text box
  764afdc1
- Merge branch 'develop' into send-button · 4e0505b5
  Gabriel Engel authored 9 years ago
  
  4e0505b5
- removing unnecessary code · 6d1e0bd9
  Diego Sampaio authored 9 years ago
  
  6d1e0bd9
- fix code indentation - closes #2454 · bd3417cd
  Diego Sampaio authored 9 years ago
  
  bd3417cd
- New implementation of OTR · 393f3d15
  Marcelo Schmidt authored 9 years ago
  
  393f3d15
- improved send button · 20accaf9
  Diego Sampaio authored 9 years ago
  
  20accaf9
- shows a send button if there is a message in the text box · 6991f9b7
  Diego Sampaio authored 9 years ago
  
  6991f9b7
- Fixes OTR check for enabled/disabled · a145bfa1
  Marcelo Schmidt authored 9 years ago
  
  a145bfa1
- trim slashes from Site_Url - closes #2462 · 7793d9e1
  Diego Sampaio authored 9 years ago
  
  7793d9e1
- Add OTR to startup, so it doesn't load before settings · 995035fa
  Marcelo Schmidt authored 9 years ago
  
  995035fa
Mar 09, 2016
- Merge pull request #2435 from RocketChat/upload-improvements · 8fcec64d
  Gabriel Engel authored 9 years ago
  
  Upload files to Amazon S3 support
  8fcec64d
- Merge branch 'develop' into upload-improvements · 033af011
  Diego Sampaio authored 9 years ago
  
  033af011
- support for delete uploaded files · 5fd74129
  Diego Sampaio authored 9 years ago
  
  5fd74129
- Merge pull request #2461 from matthias-brun/fix-roomname-change-to-null · c94e9d76
  Gabriel Engel authored 9 years ago
  
  Fix bug when changing room name and leaving value unchanged
  c94e9d76
- Merge pull request #2457 from RocketChat/otr · ee838cdd
  Gabriel Engel authored 9 years ago
  
  OTR (or encrypted messaging)
  ee838cdd
- Using AES for encryption · fd46cb4c
  Marcelo Schmidt authored 9 years ago
  
  fd46cb4c
- Add aes encryption routines · 07ae66bd
  Marcelo Schmidt authored 9 years ago
  
  07ae66bd
- Fix bug when changing room name to same value · 4a8504fe
  Matthias Brun authored 9 years ago
  
  4a8504fe
- Merge branch 'develop' into upload-improvements · 0ea80c7f
  Diego Sampaio authored 9 years ago
  
  0ea80c7f
- revert accounts:sandstorm - fixes need to login every page refresh · 92bf96ba
  Diego Sampaio authored 9 years ago
  
  92bf96ba
- revert accounts:sandstorm - fixes need to login every page refresh · 5831a596
  Diego Sampaio authored 9 years ago
  
  5831a596
- Merge branch 'develop' into upload-improvements · f6e763f6
  Diego Sampaio authored 9 years ago
  
  f6e763f6
- Try to fix error loading assets · 346a4f8e
  Rodrigo Nascimento authored 9 years ago
  
  346a4f8e
- using upload _id as S3 file name · 1e8c2891
  Diego Sampaio authored 9 years ago
  
  1e8c2891
- added Session to jshint globals · aa6d47bc
  Diego Sampaio authored 9 years ago
  
  aa6d47bc