10989 Commits (e04387af1d8f729500f1fbde43291fe9eb4b45dc)

 

All Branches   

Search

Author	SHA1	Message	Date
Luis Fernando do Nascimento	e04387af1d	Removing unneeded comma	9 years ago
Luis Fernando do Nascimento	a54af9bff5	- Changed to use the correct setting	9 years ago
Luis Fernando do Nascimento	f9d7363908	- Added error message for invalid reason ... - Added method to save reason into user object - Added validation to display field but setting Accounts_ManuallyApproveNewUsers is not working :(	9 years ago
Luis Fernando do Nascimento	24f0618a8c	Added logic to remove user reason once user gets activated	9 years ago
Luis Fernando do Nascimento	195d56bbee	- Displaying reason on user info ... - Reason displayed only if setting is active and user is not active - Added reason to getFullUserData	9 years ago
Luis Fernando do Nascimento	87b51d044f	- Added public key to use Accounts_ManuallyApproveNewUsers on frontend	9 years ago
Luis Fernando do Nascimento	4248273f24	- Modified admin message to contain reason and user name ... - Modified function placeholders to replace reason as well - Modified email template on accounts.js	9 years ago
Luis Fernando do Nascimento	b10b887a93	- Changed to use the correct setting	9 years ago
Luis Fernando do Nascimento	dbcba5634b	- Added error message for invalid reason ... - Added method to save reason into user object - Added validation to display field but setting Accounts_ManuallyApproveNewUsers is not working :(	9 years ago
Fernando Nascimento	b9f983a1b5	Added reason field into register screen	9 years ago
Luis Fernando do Nascimento	4952eb1ec8	Modified to change email to all admins at once	9 years ago
Luis Fernando do Nascimento	42201cf2c6	Fix typo and code standards	9 years ago
Luis Fernando do Nascimento	073dd0be11	Created templates for subject and mail body	9 years ago
Luis Fernando do Nascimento	1ebd3712fe	Moved email strings to propper indexes on i18n	9 years ago
Luis Fernando do Nascimento	14825360ca	Changes for issue #976. Still need some work	9 years ago
Guilherme Gazzo	2e38466800	Merge pull request #6788 from RocketChat/new-avatar-storage-types ... [NEW] New avatar storage types	9 years ago
Rodrigo Nascimento	bfd693fa94	Merge remote-tracking branch 'origin/develop' into new-avatar-storage-types ... # Conflicts: # server/startup/migrations/v096.js	9 years ago
Guilherme Gazzo	aab82ef9e2	[NEW] Internal Hubot load scripts from custom folders (#7095) ... * converted file, allow run scripts for custom folders. * translations for hubot scripts * Fix empty hubot scripts and add a migration * Add breaking changes note	9 years ago
Rodrigo Nascimento	8ff8a66c10	Unit: Fix mentions tests	9 years ago
Rodrigo Nascimento	b827c57521	Unit: Fix mentions tests	9 years ago
Rodrigo Nascimento	0a43285c72	Merge remote-tracking branch 'origin/develop' into new-avatar-storage-types	9 years ago
Rodrigo Nascimento	545eeac7ec	Fix tests	9 years ago
Rodrigo Nascimento	76534cd998	Merge pull request #6690 from alexbrazier/feature/mention-names ... [NEW] Show full name in mentions if use full name setting enabled	9 years ago
Rodrigo Nascimento	42533ddf1a	Merge pull request #7017 from RocketChat/rocketchat-oauth-to-js ... Convert oauth2-server-config package to js	9 years ago
Rodrigo Nascimento	9a01e20a0b	Merge remote-tracking branch 'origin/develop' into new-avatar-storage-types ... # Conflicts: # packages/rocketchat-importer/server/classes/ImporterBase.coffee	9 years ago
Rodrigo Nascimento	2f94694aae	Merge pull request #7022 from RocketChat/irc-to-js ... Convert irc package to js	9 years ago
Martin Schoeler	cc1fec3657	remove the missing coffee files	9 years ago
Martin Schoeler	fe5bfdd81d	fix eslint	9 years ago
Martin Schoeler	0b3d06fdb0	Bump ... Force Travis Restart	9 years ago
Guilherme Gazzo	fc0a1ab1f1	Update oauth2-client.js ... fix an logic error	9 years ago
Rodrigo Nascimento	5e31ce19bf	Merge pull request #7055 from bbrauns/fix/ldap_field_map_description ... Ldap: User_Data_FieldMap description	9 years ago
Rodrigo Nascimento	b20cff23bc	Merge pull request #7030 from pmb0/ldap-fallback-pw-store ... [FIX] do only store password if LDAP_Login_Fallback is on	9 years ago
Rodrigo Nascimento	a3e88a15ad	Merge pull request #7059 from RocketChat/increase-onread-for-here-mention ... [NEW] Increase unread message count on @here mention	9 years ago
Guilherme Gazzo	19fe2d9194	Update oauthApps.js	9 years ago
Guilherme Gazzo	e0ea65c252	Update oauthApp.js	9 years ago
Rodrigo Nascimento	dda3cb9d82	Merge pull request #7062 from RocketChat/remove-useless-unit-tests ... Remove Useless Jasmine Tests	9 years ago
Rodrigo Nascimento	bd6b4ecc2d	Merge pull request #7121 from RocketChat/xss-image ... [FIX] fix bug in preview image	9 years ago
Guilherme Gazzo	d0929da0f0	Update server.js	9 years ago
Martin Schoeler	65336060fd	remove the coffee files	9 years ago
Martin Schoeler	3d8490f89c	Merge remote-tracking branch 'origin/develop' into rocketchat-oauth-to-js	9 years ago
Martin Schoeler	9afd5ff38b	Merge remote-tracking branch 'origin/develop' into irc-to-js	9 years ago
Rodrigo Nascimento	6be835a5f1	Merge pull request #7094 from RocketChat/fix-failing-tests ... [FIX]Fix the failing tests	9 years ago
Rodrigo Nascimento	3667f378ab	Merge pull request #7085 from RocketChat/message-by-id-api ... [NEW] API method and REST Endpoint for getting a single message by id	9 years ago
Rodrigo Nascimento	27da645d0a	Merge pull request #7084 from colin-campbell/develop ... [FIX] Add option to ignore TLS in SMTP server settings	9 years ago
Rodrigo Nascimento	d695d10850	Merge pull request #7072 from jm-factorin/markdown-carriage-return ... [FIX] Add support for carriage return in markdown code blocks	9 years ago
Rodrigo Nascimento	90ef85f07c	Merge pull request #7014 from RocketChat/parse-admin-html-descriptions ... [FIX] Parse HTML on admin setting's descriptions	9 years ago
Martin Schoeler	356d3f11c9	remove coffee files	9 years ago
Martin Schoeler	eefffba7b5	Merge remote-tracking branch 'origin/develop' into irc-to-js	9 years ago
Rodrigo Nascimento	df71c2ba5f	Merge pull request #7018 from RocketChat/rocketchat-importer ... converted rocketchat-importer	9 years ago
Diego Sampaio	3586b26fef	Fix avatar migration removing new avatar entries	9 years ago