Commits · 69bde3f2eae98203392a3926cef6a1523a4a3bd6 · RocketChat / Rocket.Chat

Jan 03, 2017
- Merge remote-tracking branch 'refs/remotes/origin/admin-tests' · 69bde3f2
  Martin Schoeler authored 8 years ago
  
  Conflicts: tests/steps/11-admin.js
  69bde3f2
- finished general settings render tests · c215df3e
  Martin Schoeler authored 8 years ago
  
  c215df3e
- finished general settings render tests · 4c75725c
  Martin Schoeler authored 8 years ago
  
  4c75725c
- Merged branch admin-tests into admin-tests · dd91bc27
  Martin Schoeler authored 8 years ago
  
  dd91bc27
- added more tests · ec1ac39e
  Martin Schoeler authored 8 years ago
  
  ec1ac39e
- added more tests · 3861a1e7
  Martin Schoeler authored 8 years ago
  
  3861a1e7
- Merged branch develop into admin-tests · e0d6382a
  Martin Schoeler authored 8 years ago
  
  e0d6382a
- Increase max oplog queue size · b4228a99
  Rodrigo Nascimento authored 8 years ago
  
  Unverified
  
  b4228a99
- Fix error on model method findBySubscriptionUserId · 11fd4c65
  Rodrigo Nascimento authored 8 years ago
  
  Unverified
  
  11fd4c65
- Merge pull request #5400 from LiorHaim/develop · c1e91e6e
  Gabriel Engel authored 8 years ago
  
  Fixed hebrew translation and added missing values
  c1e91e6e
- Fixed hebrew translation and added missing values · b4fa6375
  LiorHaim authored 8 years ago
  
  b4fa6375
- Update Bcrypt from 1.0.1 to 1.0.2 · 757a55ad
  Gabriel Engel authored 8 years ago
  
  757a55ad
- Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into develop · 20fab7b1
  Gabriel Engel authored 8 years ago
  
  20fab7b1
- Update Blaze from 2.2.0 to 2.2.1 · 7b3623fa
  Gabriel Engel authored 8 years ago
  
  7b3623fa
- Merge pull request #5398 from RocketChat/lingohub_based_on_develop · f6f0552d
  Gabriel Engel authored 8 years ago
  
  LingoHub based on develop
  f6f0552d
- LingoHub Update · 50aa6265
  Gabriel Engel authored 8 years ago
  
  Manual push by LingoHub User: Gabriel Engel. Project: Rocket.Chat Made with by https://lingohub.com
  50aa6265
- Merge pull request #5396 from RocketChat/cache-strategy-improvements · 8ad265ac
  Gabriel Engel authored 8 years ago
  
  Cache strategy improvements
  8ad265ac
Jan 02, 2017
- Cache strategy improvements · 00acfc1c
  Rodrigo Nascimento authored 8 years ago
  
  Unverified
  
  00acfc1c
- Merge pull request #5371 from RocketChat/option-to-disable-cache · 6c561a41
  Gabriel Engel authored 8 years ago
  
  Cache sync without oplog
  6c561a41
- Merge pull request #5393 from RocketChat/setting-to-change-jitsi-url-prefix · afe874ce
  Gabriel Engel authored 8 years ago
  
  Add setting to change jitsi URL prefix
  afe874ce
- Add setting to change jitsi URL prefix · 358402ca
  Diego Sampaio authored 8 years ago
  
  Unverified
  
  358402ca
- Merge pull request #5391 from RocketChat/fix-layout-embedded · e7ab3554
  Gabriel Engel authored 8 years ago
  
  Fix layout embedded layout
  e7ab3554
- Fix layout embedded layout · 2faeb475
  Diego Sampaio authored 8 years ago
  
  Unverified
  
  2faeb475
- Merge pull request #5261 from RocketChat/GuruLabs-guru/rlabs-integration · bf65a139
  Gabriel Engel authored 8 years ago
  
  Rest API Integrations and Some Pagination
  bf65a139
- start general settings render tests · c854317d
  Martin Schoeler authored 8 years ago
  
  c854317d
- get more elements · efdf85f8
  Martin Schoeler authored 8 years ago
  
  efdf85f8
- get the settings elements and more render tests · 3f7b3908
  Martin Schoeler authored 8 years ago
  
  3f7b3908
- Merge pull request #5355 from RocketChat/allow-alias-send-file-message · 270c64c1
  Gabriel Engel authored 8 years ago
  
  Allow alias, avatar, and emoji in the sendFileMessage.
  270c64c1
- Update sendFileMessage.js · 3dac1d51
  Gabriel Engel authored 8 years ago
  
  3dac1d51
- Try run tests with and without oplog · df8a22e7
  Rodrigo Nascimento authored 8 years ago
  
  Unverified
  
  df8a22e7
- Add setting to disable oplog for cache sync · 80fc038f
  Rodrigo Nascimento authored 8 years ago
  
  Unverified
  
  80fc038f
- Merge pull request #5365 from galrotem1993/develop · 3a0d0deb
  Gabriel Engel authored 8 years ago
  
  fix rtl view
  3a0d0deb
- Merge remote-tracking branch 'refs/remotes/origin/admin-tests' · 7e912536
  Martin Schoeler authored 8 years ago
  
  Conflicts: tests/steps/11-admin.js
  7e912536
- add more tests · b871f2e9
  Martin Schoeler authored 8 years ago
  
  and see if they run properly on travis
  b871f2e9
- add more tests · 09a73c14
  Martin Schoeler authored 8 years ago
  
  and see if they run properly on travis
  09a73c14
- Merged branch develop into admin-tests · a9672b2e
  Martin Schoeler authored 8 years ago
  
  a9672b2e
- Merge branch 'develop' into GuruLabs-guru/rlabs-integration · 9b059039
  Bradley Hilton authored 8 years ago
  
  9b059039
- Check the contents of the msgData on sendFileMessage method · 10ec92a9
  Bradley Hilton authored 8 years ago
  
  10ec92a9
- Merge pull request #5388 from RocketChat/livechat-validate-offline-email-address · 70f985fa
  Gabriel Engel authored 8 years ago
  
  Add email address validation to livechat offline messages
  70f985fa
- Add email address validation to livechat offline messages · 052508e2
  Diego Sampaio authored 8 years ago
  
  Unverified
  
  052508e2