Commits · 33eab2320f32ff2eb00353709cdf60c82bc66198 · RocketChat / Rocket.Chat

Sep 23, 2015
- Starred messages showing again · 33eab232
  Marcelo Schmidt authored 9 years ago
  
  33eab232
- Using Models now. · 666327e6
  Marcelo Schmidt authored 9 years ago
  
  666327e6
- Merge branch 'master' into star-messages · 63693d19
  Marcelo Schmidt authored 9 years ago
  
  Conflicts: server/methods/loadHistory.coffee
  63693d19
- Close #861; Fix Gitlab oAuth url from API_Gitlab_URL · b14954ab
  Rodrigo Nascimento authored 9 years ago
  
  b14954ab
- Merge branch 'bugfix/857-cannot-add-user-to-room' · 0d8bf597
  Diego Sampaio authored 9 years ago
  
  0d8bf597
- removed deprecated code · 0d0c3ef5
  Diego Sampaio authored 9 years ago
  
  0d0c3ef5
- Fix bug where username incorrectly passed to findOneByUsername. Also · 406edf08
  Reid Wakida authored 9 years ago
  
  adds arugment validation.
  406edf08
Sep 22, 2015
- Fix oAuth · 1875e331
  Rodrigo Nascimento authored 9 years ago
  
  1875e331
- Fix login via oAuth · f4c20fd4
  Rodrigo Nascimento authored 9 years ago
  
  f4c20fd4
- Fix bug with upsert · 29ac8c7a
  Rodrigo Nascimento authored 9 years ago
  
  29ac8c7a
- Fix error on loading room · 1b438164
  Rodrigo Nascimento authored 9 years ago
  
  1b438164
- Fix spelling · 6bd24cb7
  Rodrigo Nascimento authored 9 years ago
  
  6bd24cb7
- Fix missing methods incUnreadForRoomIdExcludingUserId and incUnreadForRoomIdAndUserIds · e3649985
  Rodrigo Nascimento authored 9 years ago
  
  e3649985
- Add missin method setAlertForRoomIdExcludingUserId · c8c3f393
  Rodrigo Nascimento authored 9 years ago
  
  c8c3f393
- Merge pull request #822 from RocketChat/models · 0e5e7677
  Rodrigo Nascimento authored 9 years ago
  
  Replace Collections by Models
  0e5e7677
- Merge remote-tracking branch 'origin/master' into models · b8b74fed
  Rodrigo Nascimento authored 9 years ago
  
  # Conflicts: # packages/rocketchat-lib/settings/server/publication.coffee
  b8b74fed
- settings for livechat title and background color · 06328ec0
  Diego Sampaio authored 9 years ago
  
  06328ec0
- Fix error with model Permissions · 4372a4ce
  Rodrigo Nascimento authored 9 years ago
  
  4372a4ce
- Replace all Settings · aae68065
  Rodrigo Nascimento authored 9 years ago
  
  aae68065
- Fix packge file location · 9e929f2f
  Rodrigo Nascimento authored 9 years ago
  
  9e929f2f
- Replace all ChatPermissions · 535684be
  Rodrigo Nascimento authored 9 years ago
  
  535684be
- Fix spelling · 9346f259
  Rodrigo Nascimento authored 9 years ago
  
  9346f259
- Replace all Statistics · fa26d744
  Rodrigo Nascimento authored 9 years ago
  
  fa26d744
- Replace "new Meteor.Collection" by @_initModel in models · b4024e64
  Rodrigo Nascimento authored 9 years ago
  
  b4024e64
- Replace all OEmbed.cache · e4be2e45
  Rodrigo Nascimento authored 9 years ago
  
  e4be2e45
- Replace all ChatReports · abe1cd3b
  Rodrigo Nascimento authored 9 years ago
  
  abe1cd3b
- Remove comments · e1597e61
  Rodrigo Nascimento authored 9 years ago
  
  e1597e61
- Replace all MapReducedStatistics · 7cb07d29
  Rodrigo Nascimento authored 9 years ago
  
  7cb07d29
- Remove comment · 306eaab2
  Rodrigo Nascimento authored 9 years ago
  
  306eaab2
- Replace all ChatMessage.update · 831bfd8c
  Rodrigo Nascimento authored 9 years ago
  
  831bfd8c
- Merge remote-tracking branch 'origin/master' into models · 6e97e2ba
  Rodrigo Nascimento authored 9 years ago
  
  # Conflicts: # server/lib/cordova.coffee # server/methods/unarchiveRoom.coffee
  6e97e2ba
- Calls enter-room callback after entering the room · b3e12a3c
  Marcelo Schmidt authored 9 years ago
  
  b3e12a3c
- Merge branch 'master' into star-messages · 7cdefa2d
  Marcelo Schmidt authored 9 years ago
  
  Conflicts: i18n/en.i18n.json i18n/pt.i18n.json
  7cdefa2d
- Replaced old .admin is true by RocketChat.authz.hasRole(Meteor.userId(), 'admin') · 70f5f79d
  Marcelo Schmidt authored 9 years ago
  
  70f5f79d
- Redirect user to direct room on accept video call · a5907588
  Rodrigo Nascimento authored 9 years ago
  
  a5907588
- Close WebRTC video correctly · b8248b0c
  Rodrigo Nascimento authored 9 years ago
  
  b8248b0c
Sep 21, 2015
- Replace all ChatMessage.upsert · 9570d6f2
  Rodrigo Nascimento authored 9 years ago
  
  9570d6f2
- Replace all ChatMessage.insert · ef42cad7
  Rodrigo Nascimento authored 9 years ago
  
  ef42cad7
- Merge remote-tracking branch 'origin/master' into models · 47db1cb9
  Rodrigo Nascimento authored 9 years ago
  
  # Conflicts: # client/views/app/messagePopupConfig.coffee # server/lib/accounts.coffee
  47db1cb9
- Using _.findWhere instead of _.contains · 824ec4d7
  Marcelo Schmidt authored 9 years ago
  
  824ec4d7