Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace Collections by Models #822

Merged
merged 51 commits into from
Sep 22, 2015
Merged

Replace Collections by Models #822

merged 51 commits into from
Sep 22, 2015

Commits on Sep 15, 2015

  1. Configuration menu
    Copy the full SHA
    e56c223 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d82d02d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a10054e View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2015

  1. Configuration menu
    Copy the full SHA
    9bf7b78 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7724b20 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    3c67377 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f17ea17 View commit details
    Browse the repository at this point in the history
  5. Merge branch 'master' into models

    # Conflicts:
    #	server/lib/accounts.coffee
    #	server/methods/deleteMessage.coffee
    #	server/methods/deleteUser.coffee
    #	server/methods/eraseRoom.coffee
    #	server/methods/setUserActiveStatus.coffee
    #	server/methods/updateMessage.coffee
    #	server/publications/adminRooms.coffee
    #	server/publications/fullUserData.coffee
    #	server/publications/userChannels.coffee
    #	server/startup/initialData.coffee
    rodrigok committed Sep 16, 2015
    Configuration menu
    Copy the full SHA
    599c650 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    e03e929 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    12ef1b4 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    647312a View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    2314808 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    c8f6e15 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    0987f6a View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    fddb27a View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    8370539 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    e2fb798 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2015

  1. Configuration menu
    Copy the full SHA
    cb7a045 View commit details
    Browse the repository at this point in the history
  2. Replace all ChatRoom.findOne

    rodrigok committed Sep 17, 2015
    Configuration menu
    Copy the full SHA
    d7f7898 View commit details
    Browse the repository at this point in the history
  3. Replace all ChatRooms.find

    rodrigok committed Sep 17, 2015
    Configuration menu
    Copy the full SHA
    bfadb88 View commit details
    Browse the repository at this point in the history
  4. Replace all ChatRoom.remove

    rodrigok committed Sep 17, 2015
    Configuration menu
    Copy the full SHA
    c359c3b View commit details
    Browse the repository at this point in the history
  5. Replace all ChatRoom.upsert

    rodrigok committed Sep 17, 2015
    Configuration menu
    Copy the full SHA
    8339c99 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2015

  1. Replace all ChatRoom.update

    rodrigok committed Sep 18, 2015
    Configuration menu
    Copy the full SHA
    cc12274 View commit details
    Browse the repository at this point in the history
  2. Replace all ChatRoom.insert

    rodrigok committed Sep 18, 2015
    Configuration menu
    Copy the full SHA
    eafaabc View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2beff30 View commit details
    Browse the repository at this point in the history
  4. Merge remote-tracking branch 'origin/master' into models

    # Conflicts:
    #	packages/rocketchat-lib/package.js
    #	server/lib/accounts.coffee
    rodrigok committed Sep 18, 2015
    Configuration menu
    Copy the full SHA
    bb65dd5 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    8dedb22 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    001fdb2 View commit details
    Browse the repository at this point in the history
  7. Replace all ChatMessage.find

    rodrigok committed Sep 18, 2015
    Configuration menu
    Copy the full SHA
    263c0d1 View commit details
    Browse the repository at this point in the history
  8. Fix some errors

    rodrigok committed Sep 18, 2015
    Configuration menu
    Copy the full SHA
    02e10ff View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2015

  1. Configuration menu
    Copy the full SHA
    271233b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3a664a9 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    df2f6bb View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2015

  1. Merge remote-tracking branch 'origin/master' into models

    # Conflicts:
    #	client/views/app/messagePopupConfig.coffee
    #	server/lib/accounts.coffee
    rodrigok committed Sep 21, 2015
    Configuration menu
    Copy the full SHA
    47db1cb View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ef42cad View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9570d6f View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2015

  1. Merge remote-tracking branch 'origin/master' into models

    # Conflicts:
    #	server/lib/cordova.coffee
    #	server/methods/unarchiveRoom.coffee
    rodrigok committed Sep 22, 2015
    Configuration menu
    Copy the full SHA
    6e97e2b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    831bfd8 View commit details
    Browse the repository at this point in the history
  3. Remove comment

    rodrigok committed Sep 22, 2015
    Configuration menu
    Copy the full SHA
    306eaab View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    7cb07d2 View commit details
    Browse the repository at this point in the history
  5. Remove comments

    rodrigok committed Sep 22, 2015
    Configuration menu
    Copy the full SHA
    e1597e6 View commit details
    Browse the repository at this point in the history
  6. Replace all ChatReports

    rodrigok committed Sep 22, 2015
    Configuration menu
    Copy the full SHA
    abe1cd3 View commit details
    Browse the repository at this point in the history
  7. Replace all OEmbed.cache

    rodrigok committed Sep 22, 2015
    Configuration menu
    Copy the full SHA
    e4be2e4 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    b4024e6 View commit details
    Browse the repository at this point in the history
  9. Replace all Statistics

    rodrigok committed Sep 22, 2015
    Configuration menu
    Copy the full SHA
    fa26d74 View commit details
    Browse the repository at this point in the history
  10. Fix spelling

    rodrigok committed Sep 22, 2015
    Configuration menu
    Copy the full SHA
    9346f25 View commit details
    Browse the repository at this point in the history
  11. Replace all ChatPermissions

    rodrigok committed Sep 22, 2015
    Configuration menu
    Copy the full SHA
    535684b View commit details
    Browse the repository at this point in the history
  12. Fix packge file location

    rodrigok committed Sep 22, 2015
    Configuration menu
    Copy the full SHA
    9e929f2 View commit details
    Browse the repository at this point in the history
  13. Replace all Settings

    rodrigok committed Sep 22, 2015
    Configuration menu
    Copy the full SHA
    aae6806 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    4372a4c View commit details
    Browse the repository at this point in the history
  15. Merge remote-tracking branch 'origin/master' into models

    # Conflicts:
    #	packages/rocketchat-lib/settings/server/publication.coffee
    rodrigok committed Sep 22, 2015
    Configuration menu
    Copy the full SHA
    b8b74fe View commit details
    Browse the repository at this point in the history