2292 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Ana María Martínez Gómez	81ef0bcb6a	Merge pull request #1393 from nikhilgupta1211/xml_timezone ... Fixes #1188 show the conference timezone in show.xml.haml	2017-03-31 11:34:56 +02:00
gotens1211	73a6e06fd3	Show event time in conference timezone ... Added an application helper method `time_with_timezone` to return time with the conference timezone which solves the issue of wrong timezone in `scheule.xml` and `admin/events#show`. Fixes #1188	2017-03-31 13:13:57 +05:30
Ana María Martínez Gómez	d1bf19867c	Merge pull request #1421 from sunny-b/master ... Enable Style/NegatedIf Cop and Fix Alphabetical Ordering	2017-03-30 10:30:55 +02:00
Iris Sprague	29650beddb	enable negatedif and correct db file ... fix spacing	2017-03-29 11:24:43 -04:00
Christian Bruckmayer	6ea0752ef7	Merge pull request #1420 from siaw23/master ... Enable Rails/Validation Rubocop cop	2017-03-29 08:56:38 +02:00
Christian Bruckmayer	6891c760b4	Merge pull request #1419 from alator21/hints_for_user ... Added hints for username and name in sign up form	2017-03-29 08:55:38 +02:00
Alator	8a96bd137c	Added hints for username and name in sign up form and in edit profile	2017-03-28 23:02:40 +03:00
Emanuel Hayford	e5587d42a2	Enable Rails/Validation Rubocop cop ... Cop checks for the use of old-style attribute validation. Supports autocorrection which was run to fix the files concerned Closes #1414	2017-03-28 21:47:31 +02:00
Ana María Martínez Gómez	e2a7e396a2	Merge pull request #1417 from BelieveC/EnableZeroLengthPredicate ... Enable Style/ZeroLengthPredicate Rubocop cop	2017-03-28 13:18:13 +02:00
Chaitanya	782937b1d9	Enable Style/ZeroLengthPredicate Rubocop cop ... This cop checks for numeric comparisons that can be replaced by a predicate method. It supports autocorrection, so all the offenses where automatically solved. Closes #1416	2017-03-28 14:42:21 +05:30
Ana María Martínez Gómez	8a19c52698	Merge pull request #1398 from BelieveC/EnableRedundantSelf ... Enable Style/RedundantSelf Rubocop cop	2017-03-28 10:48:00 +02:00
Chaitanya	4427f43bdf	Enable Style/RedundantSelf Rubocop cop ... This cop checks for redundant uses of self. It supports autocorrection, so all the offenses where automatically solved. Closes #1373	2017-03-28 13:27:52 +05:30
Ana María Martínez Gómez	444ceb8960	Merge pull request #1400 from siaw23/master ... Group related cops together	2017-03-27 12:03:22 +02:00
Stella Rouzi	33201ee13c	Merge pull request #1401 from nikhilgupta1211/hakiri ... Fix hakiri error	2017-03-26 17:08:49 +03:00
Stella Rouzi	6367f3f56b	Merge pull request #1384 from siddhantbajaj/Venue ... Fixed venue link in todo list for organizer	2017-03-26 16:58:11 +03:00
Siddhant Bajaj	e8aa7c8a98	Fixed Venue link in todo list for organiser ... "Add venue" link in todo list is not active for the organiser of that conference. Fixes #1383	2017-03-26 00:25:44 +05:30
Stella Rouzi	b3be600855	Merge pull request #1405 from BelieveC/FixScheduleEventBug ... Fix SyntaxError in SchedulesController#events	2017-03-25 18:33:09 +02:00
Chaitanya	e46953e03f	Fix SyntaxError in SchedulesController#events ... Remove unexpected => from app/views/schedules/_event.html.haml to resolve syntax error Closes #1404	2017-03-25 10:41:53 +05:30
gotens1211	a1d9cc39f9	Fixes #1402 Updated nokogiri in gemfile.lock	2017-03-25 09:18:17 +05:30
Emanuel Hayford	50b2153754	Group related cops together ... This groups related cops in rubocop configuration file together and arranges them in an alphabetical order Close #1385	2017-03-24 20:13:02 +01:00
Stella Rouzi	8fb29972da	Merge pull request #1268 from shlok007/tests ... Added feature tests for Roles	2017-03-21 13:13:15 +02:00
Ana María Martínez Gómez	4b418238d2	Merge pull request #1378 from BelieveC/EnableDoubleNegation ... Fixes #1374 to Enable Style/DoubleNegation Rubocop	2017-03-21 11:44:56 +01:00
Christian Bruckmayer	8ae25730f2	Merge pull request #1250 from differentreality/reports ... Move reports to its own controler	2017-03-21 10:23:06 +01:00
Stella Rouzi	5e9bc683ae	Move reports to separate controller	2017-03-20 17:51:37 +02:00
Stella Rouzi	a325eccc77	Merge pull request #1358 from divyanshumehta/issue_1326 ... Changed Ruby syntax in views	2017-03-20 17:19:28 +02:00
Chaitanya	7de009e46e	Enable Style/DoubleNegation Rubocop cop ... This cop checks for uses of double negation (!!) to convert something to a boolean value. It doesn't support autocorrection, so all the offenses where manually solved. Closes #1374	2017-03-20 19:12:40 +05:30
divyanshumehta	1ca448df6f	Changed Ruby syntax in views. Fixed #1326	2017-03-20 18:27:39 +05:30
Hernán Schmidt	89af26bf18	Merge pull request #1387 from openSUSE/lagartoflojo-patch-1 ... Fix link to TRANSLATION guide in README	2017-03-17 16:21:03 +01:00
Ana María Martínez Gómez	125a7fe29a	Merge pull request #1309 from commandprompt/bug_1298_fix_pr ... fixes bug OSEM#1298	2017-03-17 15:44:47 +01:00
Hernán Schmidt	29e77db802	Fix link to TRANSLATION guide in readme ... It was borked.	2017-03-17 15:42:37 +01:00
Ana María Martínez Gómez	f73c449be8	Merge pull request #1371 from amiedes/test-coverage ... Increase test coverage for user model. Fix small bug.	2017-03-17 13:32:47 +01:00
Alberto Miedes Garcés	9d4c02cdb0	Improve test coverage for User model ... * Wrote specs for `User#attended_event?` * Wrote specs for `User#registered_to_event?	2017-03-17 11:26:47 +01:00
Alberto Miedes Garcés	e5aa6ab868	Fix bug in User#registered_to_event? ... Fix exception being thrown in `User#registered_to_event?` when the user is not registered in the corresponding event conference.	2017-03-17 11:26:47 +01:00
Ana María Martínez Gómez	c2866a1810	Merge pull request #1363 from differentreality/contributing_guide ... Documentation updates	2017-03-17 09:28:04 +01:00
Hernán Schmidt	d4b9ea48f9	Merge pull request #1320 from nikhilgupta1211/nav_collapse ... changed navbar dropdown for small devices. fixes #1380	2017-03-16 21:42:20 +01:00
Ana María Martínez Gómez	a5a6c81cd9	Merge pull request #1355 from chashmeetsingh/master ... Update error message	2017-03-15 15:27:41 +01:00
Chashmeet Singh	43dbb153c2	fix: #1345 (remove duplicate text in error message)	2017-03-14 22:32:24 +05:30
Stella Rouzi	b0a84ad1c6	Merge pull request #1348 from siddhantbajaj/RegistrationLimit ... Fixed registration limit issue	2017-03-14 09:12:51 +02:00
Stella Rouzi	893ad60995	Merge pull request #1364 from BelieveC/MockAuthConfigForGithub ... Add mock_auth config for Github	2017-03-13 19:38:00 +02:00
Siddhant Bajaj	3655c80feb	Fixed registration limit issue	2017-03-13 22:59:02 +05:30
Chaitanya	123c9f6a6f	Add mock_auth config for Github	2017-03-13 18:48:41 +05:30
Stella Rouzi	e8699f4258	Updating readme, install, payments, contributing files	2017-03-13 14:29:52 +02:00
Stella Rouzi	a826bb9d1e	Merge pull request #1360 from Ana06/contributing ... Improve contributing guide	2017-03-13 11:52:30 +02:00
Ana María Martínez Gómez	ea4dac2393	Merge pull request #1359 from nikhilgupta1211/view_tests ... Fix #1324 remove view tests	2017-03-13 10:02:42 +01:00
gotens1211	3ef17e921f	Removed the View Tests	2017-03-13 13:33:07 +05:30
Ana María Martínez Gómez	2c33384a87	Improve contributing guide ... Add more details to the Pull Requests workflow section.	2017-03-12 21:06:53 +01:00
gotens1211	8e4cca980e	removed the render banners component test	2017-03-12 18:31:05 +05:30
gotens1211	9c2a09eaf2	changed dropdown for small devices	2017-03-11 08:48:21 +05:30
Hernán Schmidt	05209260a4	Merge pull request #1285 from nikhilgupta1211/modify_navbar ... Sign in Ui improved in mobile	2017-03-10 17:32:05 +01:00
Ana María Martínez Gómez	00c095d054	Merge pull request #1300 from siddhantbajaj/Demo_data ... Added demo data	2017-03-10 17:13:40 +01:00