1173 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Joshua Arts	40aa64f43f	Merge pull request #232 from joshua-arts/fix-recordings ... Fix recordings table.	2018-07-30 14:58:02 -04:00
Joshua Arts	c7fbaa3f80	fix recordings lengths	2018-07-30 11:48:11 -04:00
Joshua Arts	8220a09aa1	Merge pull request #230 from joshua-arts/delete_accounts ... Add option in settings to delete account.	2018-07-27 16:05:06 -04:00
Joshua Arts	2a2e4f285c	change terms from txt to markdown	2018-07-27 15:12:27 -04:00
Joshua Arts	4b9ca3f13e	recenter errors and missing locales	2018-07-27 14:55:32 -04:00
Joshua Arts	572134f344	check for no recordings	2018-07-27 14:18:39 -04:00
Joshua Arts	7b15b84daa	delete recordings with account	2018-07-27 14:14:48 -04:00
Joshua Arts	5e5f31c375	add option in settings to delete account	2018-07-27 11:36:28 -04:00
Joshua Arts	f285377abf	Merge pull request #229 from joshua-arts/len-locale-fixes ... Fix missing locales and bump name/email max.	2018-07-26 13:34:49 -04:00
Joshua Arts	89b1afa470	fix missing locales and bump name/email max	2018-07-26 11:53:50 -04:00
Joshua Arts	fd2dc3abec	fix bug with single thumbnails erroring	2018-07-25 16:16:25 -04:00
Joshua Arts	a9892d2dcb	redesign landing & fix footer	2018-07-25 14:43:05 -04:00
Joshua Arts	6a668149b6	add padding to room block ellipsis	2018-07-24 14:55:54 -04:00
Joshua Arts	11f0c1f5e6	disable allow_greenlight_accounts when ldap is enabled	2018-07-24 11:13:04 -04:00
Joshua Arts	d6aee4d2d1	bump max name length to 32 characters	2018-07-24 11:05:25 -04:00
Joshua Arts	4e87dcbd64	Merge branch 'master' of github.com:bigbluebutton/greenlight	2018-07-24 11:01:32 -04:00
Joshua Arts	d7881fa31a	update allow_greenligth_accounts env link	2018-07-24 11:01:04 -04:00
Joshua Arts	6234bdc0df	Merge pull request #227 from bruckwubete/bn_launcher_integration ... redirect to https in prod for bn_launcher	2018-07-23 16:56:30 -04:00
bruckwubete	e60407378a	gix rubocop offense	2018-07-23 16:37:17 -04:00
Joshua Arts	12a448aa24	Merge pull request #225 from joshua-arts/ldap ... Add support for LDAP authentication.	2018-07-23 15:34:42 -04:00
bruckwubete	5f6d70f751	redirect to https in prod	2018-07-23 15:30:31 -04:00
Joshua Arts	d11390fadd	Merge pull request #226 from joshua-arts/ux-changes ... Improve UX style changes.	2018-07-23 15:17:01 -04:00
Joshua Arts	3696fa95d7	add version in footer	2018-07-23 15:06:21 -04:00
Joshua Arts	f91c6d193a	make features appear non-clickable	2018-07-23 14:40:41 -04:00
Joshua Arts	0202d09a9d	fix video link spanning entire page	2018-07-23 12:23:59 -04:00
Joshua Arts	00a3deec29	explicitly call #omniauth_fail	2018-07-23 12:07:26 -04:00
Joshua Arts	9a738c4432	add signup with provider buttons	2018-07-23 11:46:53 -04:00
Joshua Arts	40cb48a10a	remove unneeded redirect	2018-07-20 17:09:03 -04:00
Joshua Arts	690a12ceba	add relative root to ldap callback path	2018-07-20 16:04:50 -04:00
Joshua Arts	8ea2cc0928	add pull counter badge	2018-07-20 15:04:11 -04:00
Joshua Arts	473860aaa3	fix sample.env ldap link	2018-07-20 14:55:49 -04:00
Joshua Arts	775285bba9	add ldap authentication	2018-07-20 14:20:14 -04:00
Joshua Arts	212618de47	fix sample.env oauth links	2018-07-20 11:03:28 -04:00
Joshua Arts	7c0c944cb4	Merge pull request #224 from joshua-arts/localization ... Add localisation support.	2018-07-19 16:10:33 -04:00
Joshua Arts	c5cfc621ca	localize controllers	2018-07-19 16:04:08 -04:00
Joshua Arts	ce4c8b3bff	localize views	2018-07-17 11:57:49 -04:00
Joshua Arts	55b83226c9	detect users preferred language	2018-07-13 11:04:32 -04:00
Joshua Arts	29e273f5a1	Merge pull request #223 from bigbluebutton/settings-fix ... Fix Greenlight accounts unable to update settings.	2018-07-13 10:35:19 -04:00
Joshua Arts	a6b05f5fd3	fix gl accounts unable to update settings	2018-07-13 10:21:32 -04:00
Joshua Arts	8089decc17	ignore bundler files	2018-07-12 17:42:20 -04:00
Joshua Arts	f5ab362f96	add ability for custom branding images	2018-07-11 15:33:35 -04:00
Joshua Arts	20a2c570ba	Merge pull request #222 from bruckwubete/bn_launcher_integration ... Bn launcher integration	2018-07-11 15:03:29 -04:00
bruckwubete	01ea22ed6d	removed OpenSSL::SSL::VERIFY_PEER assignment	2018-07-11 14:57:00 -04:00
bruckwubete	b7801f9874	adding DB_ADAPTER check	2018-07-11 13:19:20 -04:00
Joshua Arts	1412b39620	skip cleanup and minor fixes	2018-07-11 10:23:16 -04:00
bruckwubete	cec4393837	rubocop fixes	2018-07-10 16:05:37 -04:00
bruckwubete	f36741f131	added specs for bn-launcher	2018-07-10 16:00:57 -04:00
Joshua Arts	4394b0b6e7	add rspec command to travis	2018-07-10 15:16:35 -04:00
bruckwubete	278df69c55	Merge branch 'master' into bn_launcher_integration	2018-07-10 15:07:37 -04:00
bruckwubete	c5a1f3bbce	Merge branch 'master' of https://github.com/bigbluebutton/greenlight	2018-07-10 15:07:11 -04:00