3062 Commits (877c67b26f12de6bf1dab6aebb48b942c8855b1f)

 

All Branches   

Search

Author	SHA1	Message	Date
Rafael Caferati	877c67b26f	updated package names	10 years ago
Rafael Caferati	dc8200ff5d	Removed master templates from the rocketchat-ui package	10 years ago
Rafael Caferati	6c7a9814f0	implemented rocketchat-ui-flextab, rocketchat-ui-master and renamed ui-message package	10 years ago
Rafael Caferati	bd037d11c8	Created rocketchat-ui-message-input package	10 years ago
Rafael Caferati	6e89276ca5	Added directMessagesFlex template to the side-nav	10 years ago
Rafael Caferati	d70c4e2ee6	rocketchat-ui initial implementation	10 years ago
SingLi	c4367d16cb	All build activities on develop (for now) ... Move all builds - including demo server to develop. Please merge down to master.	10 years ago
Gabriel Engel	86a2f2ff5a	Merge branch 'master' into develop	10 years ago
SingLi	cf329eb59c	Merge pull request #1387 from RocketChat/roles_rest_api ... Add permission checks to bulk rest api methods	10 years ago
Gabriel Engel	3ad8244e98	Updated default value for FileUpload_MediaTypeWhiteList	10 years ago
Gabriel Engel	91f224bf69	Merge pull request #1403 from RocketChat/develop ... Update from develop	10 years ago
Marcelo Schmidt	c46c70cf33	Updated README.md ... Added liminality.xyz post link	10 years ago
Gabriel Engel	fd17d28b83	added develop branch to the .travis.yml	10 years ago
Gabriel Engel	bacae5c0af	Merge pull request #1402 from RocketChat/lingohub ... Created and pushed by LingoHub.	10 years ago
Gabriel Engel	645949e574	Created and pushed by LingoHub. Project: 'Rocket.Chat' by User: 'gabriel.engel@gmail.com'.	10 years ago
Marcelo Schmidt	f0e776c20a	Merge pull request #1401 from RocketChat/channel-settings ... Channel settings	10 years ago
Marcelo Schmidt	6c253c3ce3	Merge branch 'develop' into channel-settings ... * develop: Conflicts: client/views/app/message.coffee	10 years ago
Gabriel Engel	43e62c8027	Merge pull request #1400 from RocketChat/message-type-api ... Message type api	10 years ago
Marcelo Schmidt	dabd419ec3	Merge branch 'develop' into channel-settings ... Conflicts: client/views/app/message.coffee	10 years ago
Marcelo Schmidt	15a8ddf0b6	Merge branch 'develop' into message-type-api ... * develop: Fixed conflicts added Git Flow and HISTORY.md Deletes direct message subscription for users conversing with user being deleted. Fix Room model's removeByTypeContainingUsername. usernames field missing trailing 's' Remove the added console log Combine the first two checks into one to make it more readable Update message pinning to show up on the tab list with a few options to allow/disallow it and whether to allow anyone to pin messages Moved oembed code to a template helper. Conflicts: client/views/app/message.coffee	10 years ago
Marcelo Schmidt	1a3ed386d3	Merge branch 'master' into develop ... * master: Fixed conflicts added Git Flow and HISTORY.md Remove the added console log Combine the first two checks into one to make it more readable Update message pinning to show up on the tab list with a few options to allow/disallow it and whether to allow anyone to pin messages Moved oembed code to a template helper.	10 years ago
Marcelo Schmidt	666dd654a4	Merge branch 'master' of github.com:RocketChat/Rocket.Chat ... * 'master' of github.com:RocketChat/Rocket.Chat: added Git Flow and HISTORY.md	10 years ago
Marcelo Schmidt	eec7f64411	Merge branch 'mitar-move-oembed-to-helper' ... * mitar-move-oembed-to-helper: Fixed conflicts Moved oembed code to a template helper.	10 years ago
Marcelo Schmidt	b9a969a5b5	Fixed conflicts	10 years ago
Marcelo Schmidt	785bf24c91	Merge branch 'move-oembed-to-helper' of https://github.com/mitar/Rocket.Chat into mitar-move-oembed-to-helper ... # By Mitar # Via Mitar * 'move-oembed-to-helper' of https://github.com/mitar/Rocket.Chat: Moved oembed code to a template helper. # Conflicts: # client/views/app/message.coffee	10 years ago
Gabriel Engel	01830674d6	added Git Flow and HISTORY.md	10 years ago
Marcelo Schmidt	1977d10e74	Change channel type; Closes #1037	10 years ago
Gabriel Engel	8a802c2363	Merge pull request #1393 from RocketChat/fix_delete_user_subscriptions ... Remove direct message subscription for both users when one is deleted	10 years ago
Marcelo Schmidt	4b8fac9d97	Merge branch 'message-type-api' into channel-settings ... * message-type-api: Created RocketChat.MessageTypes class to hold message type rendering rules Removed unused 'nu' message type Send e-mail on first username set Add enrollment email	10 years ago
Marcelo Schmidt	a3ea777cf1	Created RocketChat.MessageTypes class to hold message type rendering rules	10 years ago
Aaron Ogle	4f266f68e3	Merge pull request #1382 from graywolf336/change-pin-messages-method ... Add Pinning Functionality	10 years ago
Reid Wakida	260b3b7724	Deletes direct message subscription for users conversing with user being deleted. ... Fixes #1149 where "other" user's subscription for non-deleted, direct message, was not deleted. This led to duplicate key error if a new user, with the same username as the deleted user, is created and tries to direct message the "other" user.	10 years ago
Reid Wakida	c9cf46a3dd	Fix Room model's removeByTypeContainingUsername. usernames field missing trailing 's'	10 years ago
graywolf336	79281ae41e	Merge branch 'master' into change-pin-messages-method	10 years ago
Marcelo Schmidt	152aabd035	Merge branch 'master' of github.com:RocketChat/Rocket.Chat ... # Via Marcelo Schmidt (2) and Gabriel Engel (1) * 'master' of github.com:RocketChat/Rocket.Chat: Send e-mail on first username set Add enrollment email	10 years ago
Marcelo Schmidt	2ddb27db6a	Removed unused 'nu' message type	10 years ago
Gabriel Engel	8922b30867	Merge pull request #1390 from RocketChat/enrollment-email ... Enrollment email	10 years ago
Marcelo Schmidt	f94f6ac022	Merge branch 'master' into channel-settings ... * master: (409 commits) Changes to rocketmailer allows any from address. Add default allowed file upload Fix #1381 add SECURITY.md Using official emojione package Using official emojione package 3,000 commits!! Created and pushed by LingoHub. Project: 'Rocket.Chat' by User: 'gabriel.engel@gmail.com'. try new guest count every loop sorting i18n strings Created and pushed by LingoHub. Project: 'Rocket.Chat' by User: 'gabriel.engel@gmail.com'. use correct settings for livechat app Created and pushed by LingoHub. Project: 'Rocket.Chat' by User: 'gabriel.engel@gmail.com'. meteor update update old build script there is no message to update yet livechat room publish room icons RocketMailer and Unsubscription preventDefault on shift + esc shortcut ... Conflicts: .meteor/packages .meteor/versions	10 years ago
Marcelo Schmidt	2fbe4dc4a2	Merge branch 'master' into enrollment-email	10 years ago
Gabriel Engel	fdd0c2a154	Merge pull request #1389 from RocketChat/rocket-mailer ... Rocket mailer	10 years ago
Marcelo Schmidt	2b8524f9c7	Send e-mail on first username set	10 years ago
graywolf336	8034fff9e0	Remove the added console log	10 years ago
graywolf336	3f2463d5e8	Combine the first two checks into one to make it more readable	10 years ago
Marcelo Schmidt	81cae68845	Changes to rocketmailer allows any from address.	10 years ago
graywolf336	255fab1b5e	Merge branch 'master' into change-pin-messages-method	10 years ago
Marcelo Schmidt	d68daaec6b	Merge branch 'master' into rocket-mailer ... * master: (24 commits) Add default allowed file upload Fix #1381 add SECURITY.md Using official emojione package Using official emojione package 3,000 commits!! Created and pushed by LingoHub. Project: 'Rocket.Chat' by User: 'gabriel.engel@gmail.com'. try new guest count every loop sorting i18n strings Created and pushed by LingoHub. Project: 'Rocket.Chat' by User: 'gabriel.engel@gmail.com'. use correct settings for livechat app Created and pushed by LingoHub. Project: 'Rocket.Chat' by User: 'gabriel.engel@gmail.com'. meteor update update old build script there is no message to update yet livechat room publish room icons added back _colors files livechat route fixing livechat route ...	10 years ago
Marcelo Schmidt	61608d2c9c	Add default allowed file upload	10 years ago
Marcelo Schmidt	63c0d15281	Fix #1381	10 years ago
S. Li	b2d6757e8a	add SECURITY.md	10 years ago
Reid Wakida	55efdea054	Adds 2 new permissions related to bulk user registration and bulk channel creation. Permissions are assigned ... admin role. The nimble:restivus package, used by REST api, does not support alanning:roles with 'groups'. It doesn't even use the alanning:roles API to check for roles. As a workaround, I removed restivus's rolesRequired check from the bulk api methods and added Rocketchat.authz.hasPermission checks.	10 years ago