Commit graph

  • 5f74360da8 Merge pull request #1441 from neilhalligan/rubocop-edit Christian Bruckmayer 2017-04-06 09:34:41 +02:00
  • 7e54771f52 Moves style/tab cop to proper line Cops should be in alphabetical order so I moved this to line 91 where it belongs. Cody Borders 2017-04-05 15:43:12 -06:00
  • 48287a24d7 Update room's feature and controller test for room creation via Ajax Chaitanya 2017-04-06 01:41:30 +05:30
  • 5f514bfb4c Improve remove creation using Ajax Chaitanya 2017-04-06 01:41:16 +05:30
  • c74e914683 Add Lint/DuplicatedKey to rubocop Neil Halligan 2017-04-05 17:33:14 +01:00
  • 7497d0394e Fix Splashpages#show so it matches splashpages#edit nasia 2017-04-05 19:18:17 +03:00
  • c149710da4 Merge pull request #1341 from nikhilgupta1211/edit_splashpage Ana María Martínez Gómez 2017-04-05 14:34:09 +02:00
  • d499f88217 Add files via upload Abhinand-p 2017-04-05 17:18:57 +05:30
  • eb1e8ed238 Changed the default state of components in splashpage to selected gotens1211 2017-03-08 15:27:38 +05:30
  • fbd628c7e5 Update Gemfile Abhinand-p 2017-04-05 17:06:53 +05:30
  • 6188896372 Update Gemfile Abhinand-p 2017-04-05 16:55:55 +05:30
  • dae9aca2c5 Merge pull request #1434 from nasia-sam/admin_resources Christian Bruckmayer 2017-04-05 13:17:31 +02:00
  • 2c888eda04 Update Gemfile Abhinand-p 2017-04-05 03:34:26 -07:00
  • 1470976e40 Add files via upload Abhinand-p 2017-04-05 03:31:53 -07:00
  • 5ed2ebe910 Update venue.rb Abhinand-p 2017-04-05 03:27:54 -07:00
  • 5047ede1e0 Add description to xml. fixes #1435 David Sedeño 2017-04-04 22:27:42 +02:00
  • 6414631a32 Fix admin/resources inherit nasia 2017-04-04 21:30:16 +03:00
  • fc1448b47b Fixes Style/Tab cops Removes exclusions for Style/Tab cops in rubocop_todo All cops now fixed. Cody Borders 2017-04-04 11:48:52 -06:00
  • ab0719096a Merge pull request #1366 from AEtherC0r3/openid_documentation Stella Rouzi 2017-04-04 15:52:58 +03:00
  • 7297888e38 Merge pull request #1429 from commandprompt/flash_messages_fix_pr Stella Rouzi 2017-04-04 15:51:32 +03:00
  • 4b22a4547c Adds Style/Tab cop to rubocop.yml Cody Borders 2017-04-03 15:18:04 -06:00
  • 3f46fed0b2 Remove reference to secrets.yml in INSTALL.md AEtherC0r3 2017-03-25 23:19:59 +02:00
  • dcd57934fb Add OpenID test documentation AEtherC0r3 2017-03-13 18:16:07 +02:00
  • b7bdb29cbe use flash.now instead of flash where page is rendered in the same controller methods Eugene Dubinin 2017-04-03 18:34:37 +03:00
  • d90d2344d6 Merge pull request #1423 from nikhilgupta1211/splashpage Stella Rouzi 2017-04-03 13:59:44 +03:00
  • f3e712a1bc Merge pull request #1319 from JewelSam/master Ana María Martínez Gómez 2017-04-03 10:23:49 +02:00
  • f6e74461ba Add schedule interval as attribute of a program JewelSam 2017-03-02 20:53:20 +03:00
  • 529b8eb710 Solved Issue 1259 divyanshumehta 2017-02-11 16:45:27 +05:30
  • 42741fa90b Merge pull request #1352 from BelieveC/ScheduleLogIn Ana María Martínez Gómez 2017-03-31 15:58:26 +02:00
  • af09ad239c Merge pull request #1426 from nasia-sam/dublicated_routes Ana María Martínez Gómez 2017-03-31 15:54:00 +02:00
  • 93b185e8d8 Merge pull request #1370 from alator21/move_proposal_edit_to_admin Ana María Martínez Gómez 2017-03-31 15:53:49 +02:00
  • 962bbaedb2 Fix dublicated routes nasia 2017-03-31 15:48:44 +03:00
  • bd51be45e5 Added Include Venue and Lodgings to Splashpage components gotens1211 2017-03-30 07:00:55 +05:30
  • 81ef0bcb6a Merge pull request #1393 from nikhilgupta1211/xml_timezone Ana María Martínez Gómez 2017-03-31 11:34:56 +02:00
  • 73a6e06fd3 Show event time in conference timezone gotens1211 2017-03-20 19:11:03 +05:30
  • b55ecf93fb add haml-lint.yml hitman 2017-03-21 18:06:08 +05:30
  • 5a6229ad7b add haml_lint gem hitman 2017-03-21 18:05:42 +05:30
  • d1bf19867c Merge pull request #1421 from sunny-b/master Ana María Martínez Gómez 2017-03-30 10:30:55 +02:00
  • 29650beddb enable negatedif and correct db file Iris Sprague 2017-03-28 22:20:27 -04:00
  • 6ea0752ef7 Merge pull request #1420 from siaw23/master Christian Bruckmayer 2017-03-29 08:56:38 +02:00
  • 6891c760b4 Merge pull request #1419 from alator21/hints_for_user Christian Bruckmayer 2017-03-29 08:55:38 +02:00
  • 440720f0c8 Fix no method error in Admin::Events#index Chaitanya 2017-03-29 08:01:22 +05:30
  • 8a96bd137c Added hints for username and name in sign up form and in edit profile Alator 2017-03-28 17:54:27 +03:00
  • e5587d42a2 Enable Rails/Validation Rubocop cop Emanuel Hayford 2017-03-28 21:47:17 +02:00
  • b453b2edb6 Merge f90aac3dc0 into e2a7e396a2 alator21 2017-03-28 14:57:36 +00:00
  • f90aac3dc0 Added hints for username and name in sign up form Alator 2017-03-28 17:54:27 +03:00
  • ea52b0622b Merge acbc7df96a into e2a7e396a2 Mustafa Serhat Dündar 2017-03-28 11:24:32 +00:00
  • e2a7e396a2 Merge pull request #1417 from BelieveC/EnableZeroLengthPredicate Ana María Martínez Gómez 2017-03-28 13:18:13 +02:00
  • 782937b1d9 Enable Style/ZeroLengthPredicate Rubocop cop Chaitanya 2017-03-28 14:42:21 +05:30
  • 8a19c52698 Merge pull request #1398 from BelieveC/EnableRedundantSelf Ana María Martínez Gómez 2017-03-28 10:48:00 +02:00
  • 4427f43bdf Enable Style/RedundantSelf Rubocop cop Chaitanya 2017-03-28 13:27:52 +05:30
  • 444ceb8960 Merge pull request #1400 from siaw23/master Ana María Martínez Gómez 2017-03-27 12:03:22 +02:00
  • 2c1623a73b Merge 69f4771ec6 into 33201ee13c Nishanth Vijayan 2017-03-26 16:34:16 +00:00
  • 33201ee13c Merge pull request #1401 from nikhilgupta1211/hakiri Stella Rouzi 2017-03-26 17:08:49 +03:00
  • 6367f3f56b Merge pull request #1384 from siddhantbajaj/Venue Stella Rouzi 2017-03-26 16:58:11 +03:00
  • acbc7df96a Fix #1406. Validate password only on create msdundar 2017-03-26 02:55:19 +03:00
  • a659cb615a Fix #1409. Add a label for email_public and hide openids when they are not present msdundar 2017-03-26 02:30:24 +03:00
  • a6cdd93a66 Fix #1406. Registration form consistency with User model msdundar 2017-03-26 01:58:09 +03:00
  • e8aa7c8a98 Fixed Venue link in todo list for organiser Siddhant Bajaj 2017-03-26 00:20:37 +05:30
  • b3be600855 Merge pull request #1405 from BelieveC/FixScheduleEventBug Stella Rouzi 2017-03-25 18:33:09 +02:00
  • e46953e03f Fix SyntaxError in SchedulesController#events Chaitanya 2017-03-25 10:41:53 +05:30
  • a1d9cc39f9 Fixes #1402 Updated nokogiri in gemfile.lock gotens1211 2017-03-25 01:43:17 +05:30
  • 50b2153754 Group related cops together Emanuel Hayford 2017-03-24 20:13:02 +01:00
  • 0e8e626156 Allow to view schedule without login Chaitanya 2017-03-24 20:52:27 +05:30
  • 2036c89911 Add DO NOT MERGE label Ana María Martínez Gómez 2017-03-23 09:28:10 +01:00
  • d860ec5607 Update proposal link in reports Alator 2017-03-14 20:37:56 +02:00
  • 78b99be644 Fixes #1195 Made the charts responsive for small screens gotens1211 2017-03-21 17:57:01 +05:30
  • 8fb29972da Merge pull request #1268 from shlok007/tests Stella Rouzi 2017-03-21 13:13:15 +02:00
  • 4b418238d2 Merge pull request #1378 from BelieveC/EnableDoubleNegation Ana María Martínez Gómez 2017-03-21 11:44:56 +01:00
  • 06d9a0e396
    Update commit section in CONTRIBUTING.md Christian Bruckmayer 2017-03-17 15:54:23 +01:00
  • 8ae25730f2 Merge pull request #1250 from differentreality/reports Christian Bruckmayer 2017-03-21 10:23:06 +01:00
  • 5e9bc683ae Move reports to separate controller Stella Rouzi 2017-03-03 15:45:06 +02:00
  • a325eccc77 Merge pull request #1358 from divyanshumehta/issue_1326 Stella Rouzi 2017-03-20 17:19:28 +02:00
  • 7de009e46e Enable Style/DoubleNegation Rubocop cop Chaitanya 2017-03-20 19:12:40 +05:30
  • 1ca448df6f Changed Ruby syntax in views. Fixed #1326 divyanshumehta 2017-03-11 13:25:39 +05:30
  • d059b7aed1 Merge a907c1da58 into 89af26bf18 Ana María Martínez Gómez 2017-03-19 09:56:30 +00:00
  • a907c1da58 Move update favorites to a separate action Ana María Martínez Gómez 2017-03-19 10:34:14 +01:00
  • f54df5922e Show the individual User schedule Ana 2016-08-13 02:26:02 +02:00
  • 9154f1883d Make it possible to select favourites events Ana 2016-08-12 00:41:02 +02:00
  • 7f7375b7db Introduce an association between User and Event Ana 2016-08-11 16:38:39 +02:00
  • 214d0edb70 Add tests for Answer Model Chaitanya 2017-03-19 11:43:16 +05:30
  • 47c62ba841 Merge 18d0f6215b into 89af26bf18 Chaitanya Yadav 2017-03-17 15:21:07 +00:00
  • 89af26bf18 Merge pull request #1387 from openSUSE/lagartoflojo-patch-1 Hernán Schmidt 2017-03-17 16:21:03 +01:00
  • 125a7fe29a Merge pull request #1309 from commandprompt/bug_1298_fix_pr Ana María Martínez Gómez 2017-03-17 15:44:47 +01:00
  • 29e77db802 Fix link to TRANSLATION guide in readme Hernán Schmidt 2017-03-17 15:42:37 +01:00
  • f73c449be8 Merge pull request #1371 from amiedes/test-coverage Ana María Martínez Gómez 2017-03-17 13:32:47 +01:00
  • 9d4c02cdb0 Improve test coverage for User model Alberto Miedes Garcés 2017-03-15 23:40:19 +01:00
  • e5aa6ab868 Fix bug in User#registered_to_event? Alberto Miedes Garcés 2017-03-15 23:35:29 +01:00
  • c2866a1810 Merge pull request #1363 from differentreality/contributing_guide Ana María Martínez Gómez 2017-03-17 09:28:04 +01:00
  • de83df99a8 Merge b82ec308a6 into d4b9ea48f9 P. Seetaramaraju 2017-03-17 01:40:00 +00:00
  • 5c3c04aaab Merge ffb0e25689 into d4b9ea48f9 P. Seetaramaraju 2017-03-17 01:39:59 +00:00
  • 23d8229fa0 Merge c5e3d495bb into d4b9ea48f9 Emanuel 2017-03-17 01:39:59 +00:00
  • 6fac651188 Merge 4ef78e2b9d into d4b9ea48f9 Emanuel 2017-03-17 01:39:59 +00:00
  • d4b9ea48f9 Merge pull request #1320 from nikhilgupta1211/nav_collapse Hernán Schmidt 2017-03-16 21:42:20 +01:00
  • 265cc954c6 Fix jQuery version TheAssassin 2017-03-16 10:51:36 +01:00
  • 4ef78e2b9d Restore previously modified files with minor fixes Emanuel Hayford 2017-03-16 06:55:34 +01:00
  • 33df0ee8e4 Fixes #1230. Makes comment counter more efficient Emanuel Hayford 2017-03-16 06:41:15 +01:00
  • 0b435e6567 Added a validation on created at attribute of Registration model Siddhant Bajaj 2017-03-11 01:14:07 +05:30
  • a5a6c81cd9 Merge pull request #1355 from chashmeetsingh/master Ana María Martínez Gómez 2017-03-15 15:27:41 +01:00
  • 43dbb153c2 fix: #1345 (remove duplicate text in error message) Chashmeet Singh 2017-03-11 21:01:06 +05:30