Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into imports/meteor-1
Browse files Browse the repository at this point in the history
  • Loading branch information
rodrigok committed Nov 1, 2018
2 parents b844ba1 + afd747d commit 05b9956
Show file tree
Hide file tree
Showing 102 changed files with 4,836 additions and 4,554 deletions.
5 changes: 3 additions & 2 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@ packages/rocketchat-livechat/.app/node_modules
packages/rocketchat-livechat/.app/.meteor
packages/rocketchat-livechat/assets/rocketchat-livechat.min.js
packages/rocketchat-livechat/assets/rocket-livechat.js
packages/rocketchat-theme/client/minicolors/jquery.minicolors.js
packages/rocketchat_theme/client/minicolors/jquery.minicolors.js
packages/rocketchat_theme/client/minicolors/jquery.minicolors.js
packages/rocketchat_theme/client/vendor/
packages/rocketchat-ui/client/lib/customEventPolyfill.js
packages/rocketchat-ui/client/lib/Modernizr.js
packages/rocketchat-ui/client/lib/recorderjs/recorder.js
packages/rocketchat-videobridge/client/public/external_api.js
packages/rocketchat-theme/client/vendor/
packages/tap-i18n/lib/tap_i18next/tap_i18next-1.7.3.js
private/moment-locales/
public/livechat/
Expand Down
5 changes: 5 additions & 0 deletions .github/history-manual.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,10 @@
"title": "[FIX] Removed Deprecated Package rocketchat:sharedsecret`",
"userLogin": "rodrigok",
"contributors": []
}],
"0.72.0": [{
"title": "[BREAK] Support for Cordova (Rocket.Chat Legacy app) has reached End-of-life, support has been discontinued",
"userLogin": "sampaiodiego",
"contributors": []
}]
}
44 changes: 22 additions & 22 deletions .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -5,38 +5,38 @@

rocketchat:cors

accounts-facebook@1.3.1
accounts-github@1.4.1
accounts-google@1.3.1
accounts-meteor-developer@1.4.1
accounts-password@1.5.0
accounts-twitter@1.4.1
accounts-facebook@1.3.2
accounts-github@1.4.2
accounts-google@1.3.2
accounts-meteor-developer@1.4.2
accounts-password@1.5.1
accounts-twitter@1.4.2
blaze-html-templates
check@1.3.0
check@1.3.1
ddp-rate-limiter@1.0.7
ddp-common@1.4.0
dynamic-import@0.3.0
ecmascript@0.10.6
dynamic-import@0.5.0
ecmascript@0.12.0
ejson@1.1.0
email@1.2.3
fastclick@1.0.13
http@1.4.0
http@1.4.1
jquery@1.11.10
logging@1.1.19
meteor-base@1.3.0
logging@1.1.20
meteor-base@1.4.0
mobile-experience@1.0.5
mongo@1.4.2
mongo@1.6.0
random@1.1.0
rate-limit@1.0.8
reactive-dict@1.2.0
rate-limit@1.0.9
reactive-dict@1.2.1
reactive-var@1.0.11
reload@1.2.0
service-configuration@1.0.11
session@1.1.7
shell-server@0.3.1
session@1.1.8
shell-server@0.4.0
spacebars
standard-minifier-js@2.3.1
tracker@1.1.3
standard-minifier-js@2.4.0
tracker@1.2.0

rocketchat:2fa
rocketchat:action-links
Expand Down Expand Up @@ -108,7 +108,6 @@ rocketchat:monitoring
rocketchat:oauth2-server-config
rocketchat:oembed
rocketchat:otr
rocketchat:postcss
rocketchat:push-notifications
rocketchat:reactions
rocketchat:retention-policy
Expand Down Expand Up @@ -183,7 +182,6 @@ nimble:restivus
nooitaf:colors
ostrio:cookies
pauli:accounts-linkedin
percolate:synced-cron
raix:handlebar-helpers
rocketchat:push
raix:ui-dropped-event
Expand All @@ -199,6 +197,8 @@ rocketchat:search
chatpal:search
rocketchat:lazy-load
tap:i18n
underscore
underscore@1.0.10
rocketchat:bigbluebutton
rocketchat:mailmessages
juliancwirko:postcss
littledata:synced-cron
1 change: 0 additions & 1 deletion .meteor/platforms
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
browser
ios
server
2 changes: 1 addition & 1 deletion .meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
METEOR@1.6.1.3
METEOR@1.8
113 changes: 58 additions & 55 deletions .meteor/versions
Original file line number Diff line number Diff line change
@@ -1,67 +1,70 @@
accounts-base@1.4.2
accounts-facebook@1.3.1
accounts-github@1.4.1
accounts-google@1.3.1
accounts-meteor-developer@1.4.1
accounts-oauth@1.1.15
accounts-base@1.4.3
accounts-facebook@1.3.2
accounts-github@1.4.2
accounts-google@1.3.2
accounts-meteor-developer@1.4.2
accounts-oauth@1.1.16
accounts-password@1.5.1
accounts-twitter@1.4.1
accounts-twitter@1.4.2
aldeed:simple-schema@1.5.4
allow-deny@1.1.0
autoupdate@1.4.0
babel-compiler@7.0.9
babel-runtime@1.2.2
autoupdate@1.5.0
babel-compiler@7.2.1
babel-runtime@1.3.0
base64@1.0.11
binary-heap@1.0.10
blaze@2.3.2
binary-heap@1.0.11
blaze@2.3.3
blaze-html-templates@1.1.2
blaze-tools@1.0.10
boilerplate-generator@1.4.0
caching-compiler@1.1.12
caching-html-compiler@1.1.2
boilerplate-generator@1.6.0
caching-compiler@1.2.0
caching-html-compiler@1.1.3
callback-hook@1.1.0
cfs:http-methods@0.0.32
chatpal:search@0.0.1
check@1.3.1
coffeescript@1.0.17
dandv:caret-position@2.1.1
ddp@1.4.0
ddp-client@2.3.2
ddp-client@2.3.3
ddp-common@1.4.0
ddp-rate-limiter@1.0.7
ddp-server@2.1.2
ddp-server@2.2.0
deepwell:bootstrap-datepicker2@1.3.0
deps@1.0.12
diff-sequence@1.1.0
dispatch:run-as-user@1.1.1
dynamic-import@0.3.0
ecmascript@0.10.9
ecmascript-runtime@0.5.0
ecmascript-runtime-client@0.6.2
ecmascript-runtime-server@0.5.0
dynamic-import@0.5.0
ecmascript@0.12.1
ecmascript-runtime@0.7.0
ecmascript-runtime-client@0.8.0
ecmascript-runtime-server@0.7.1
edgee:slingshot@0.7.1
ejson@1.1.0
email@1.2.3
emojione:emojione@2.2.6
es5-shim@4.7.3
facebook-oauth@1.4.1
es5-shim@4.8.0
facebook-oauth@1.5.0
fastclick@1.0.13
fetch@0.1.0
francocatena:status@1.5.3
geojson-utils@1.0.10
github-oauth@1.2.0
google-oauth@1.2.5
github-oauth@1.2.2
google-oauth@1.2.6
hot-code-push@1.0.4
html-tools@1.0.11
htmljs@1.0.11
http@1.4.1
id-map@1.1.0
inter-process-messaging@0.1.0
jalik:ufs@0.7.5
jalik:ufs-gridfs@0.2.1
jalik:ufs-local@0.2.9
jparker:crypto-core@0.1.0
jparker:crypto-md5@0.1.1
jparker:gravatar@0.5.1
jquery@1.11.11
juliancwirko:postcss@2.0.3
kadira:blaze-layout@2.3.0
kadira:flow-router@2.12.1
keepnox:perfect-scrollbar@0.6.8
Expand All @@ -72,28 +75,31 @@ konecty:mongo-counter@0.0.5_3
konecty:multiple-instances-status@1.1.0
konecty:user-presence@2.2.0
launch-screen@1.1.1
less@2.7.12
less@2.8.0
littledata:synced-cron@1.5.1
livedata@1.0.18
localstorage@1.2.0
logging@1.1.20
matb33:collection-hooks@0.8.4
mdg:validation-error@0.5.1
meteor@1.8.6
meteor-base@1.3.0
meteor-developer-oauth@1.2.0
meteor@1.9.2
meteor-base@1.4.0
meteor-developer-oauth@1.2.1
meteorhacks:inject-initial@1.0.4
meteorhacks:meteorx@1.4.1
meteorspark:util@0.2.0
minifier-css@1.3.1
minifier-js@2.3.5
minimongo@1.4.4
minifier-css@1.4.0
minifier-js@2.4.0
minimongo@1.4.5
mizzao:autocomplete@0.5.1
mizzao:timesync@0.3.4
mobile-experience@1.0.5
mobile-status-bar@1.0.14
modules@0.11.8
modules-runtime@0.9.2
mongo@1.4.7
modern-browsers@0.1.2
modules@0.13.0
modules-runtime@0.10.3
mongo@1.6.0
mongo-decimal@0.1.0
mongo-dev-server@1.1.0
mongo-id@1.0.7
mongo-livedata@1.0.12
Expand All @@ -102,24 +108,23 @@ mystor:device-detection@0.2.0
nimble:restivus@0.8.12
nooitaf:colors@1.1.2_1
npm-bcrypt@0.9.3
npm-mongo@2.2.34
oauth@1.2.3
oauth1@1.2.0
oauth2@1.2.0
npm-mongo@3.1.1
oauth@1.2.5
oauth1@1.2.1
oauth2@1.2.1
observe-sequence@1.0.16
ordered-dict@1.1.0
ostrio:cookies@2.2.4
ostrio:cookies@2.3.0
pauli:accounts-linkedin@2.1.5
pauli:linkedin-oauth@1.2.0
percolate:synced-cron@1.3.2
promise@0.10.2
promise@0.11.1
raix:eventemitter@0.1.3
raix:eventstate@0.0.4
raix:handlebar-helpers@0.2.5
raix:ui-dropped-event@0.0.7
random@1.1.0
rate-limit@1.0.9
reactive-dict@1.2.0
reactive-dict@1.2.1
reactive-var@1.0.11
reload@1.2.0
retry@1.1.0
Expand Down Expand Up @@ -202,7 +207,6 @@ rocketchat:oauth2-server@2.0.0
rocketchat:oauth2-server-config@1.0.0
rocketchat:oembed@0.0.1
rocketchat:otr@0.0.1
rocketchat:postcss@1.0.0
rocketchat:push@3.3.1
rocketchat:push-notifications@0.0.1
rocketchat:reactions@0.0.1
Expand Down Expand Up @@ -254,33 +258,32 @@ rocketchat:videobridge@0.2.0
rocketchat:webdav@0.0.1
rocketchat:webrtc@0.0.1
rocketchat:wordpress@0.0.1
routepolicy@1.0.13
server-render@0.3.1
routepolicy@1.1.0
service-configuration@1.0.11
session@1.1.7
session@1.1.8
sha@1.0.9
shell-server@0.3.1
shim-common@0.1.0
shell-server@0.4.0
simple:json-routes@2.1.0
socket-stream-client@0.1.0
socket-stream-client@0.2.2
spacebars@1.0.15
spacebars-compiler@1.1.3
srp@1.0.10
standard-minifier-js@2.3.4
srp@1.0.12
standard-minifier-js@2.4.0
steffo:meteor-accounts-saml@0.0.1
swydo:graphql@0.4.0
tap:i18n@1.8.2
templating@1.3.2
templating-compiler@1.3.3
templating-runtime@1.3.2
templating-tools@1.1.2
tmeasday:check-npm-versions@0.3.2
todda00:friendly-slugs@0.6.0
tracker@1.1.3
tracker@1.2.0
twitter-oauth@1.2.0
ui@1.0.13
underscore@1.0.10
url@1.2.0
webapp@1.5.0
webapp@1.7.0
webapp-hashing@1.0.9
yasaricli:slugify@0.0.7
yasinuslu:blaze-meta@0.3.3
18 changes: 6 additions & 12 deletions .postcssrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"plugins": {
"postcss-import": {},
"postcss-easy-import": {},
"postcss-custom-properties": {
"preserve": true
},
Expand All @@ -9,18 +9,12 @@
"postcss-nested": {},
"autoprefixer": {
"browsers": [
"ie > 10",
"last 2 Edge versions",
"last 2 Firefox versions",
"last 1 FirefoxAndroid versions",
"last 2 Chrome versions",
"last 1 ChromeAndroid versions",
"Safari > 7",
"last 2 Opera versions",
"last 2 iOS versions",
"last 1 Android version"
"last 2 versions"
]
}
},
"excludedPackages": ["deepwell:bootstrap-datepicker2", "smoral:sweetalert"]
"excludedPackages": [
"deepwell:bootstrap-datepicker2",
"smoral:sweetalert"
]
}
2 changes: 1 addition & 1 deletion .stylelintignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
packages/rocketchat-theme/client/vendor/fontello/css/fontello.css
packages/rocketchat_theme/client/vendor/fontello/css/fontello.css
packages/meteor-autocomplete/client/autocomplete.css
Loading

0 comments on commit 05b9956

Please sign in to comment.