Commit graph

  • 5734c90d1e views for call for booths nasia 2017-06-26 18:24:32 +03:00
  • 60ec569553 Modify views for booths nasia 2017-06-18 23:33:54 +03:00
  • a5ce1239f2 Refactor admin/call_for_booth controller nasia 2017-06-10 23:50:31 +03:00
  • 6a8b9f8d2d Create tests for models nasia 2017-06-10 15:17:19 +03:00
  • 3172cfcbb2 Introduce Booths and Call for Booths to OSEM nasia 2017-05-17 13:31:27 +03:00
  • 267f080ac7 Enable Style/CommentAnnotation Rubocop cop Ana María Martínez Gómez 2017-06-26 16:47:07 +02:00
  • 2223523fa0 Merge pull request #1550 from Ana06/version-test Ana María Martínez Gómez 2017-06-26 16:27:17 +02:00
  • 905f8954d0 Fix broken test in Admin::EventsController Ana María Martínez Gómez 2017-06-17 20:32:57 +02:00
  • d8c2ad6125 Add option to render html at format_helper Dimitris 2017-06-16 02:51:01 +03:00
  • 30375505a0 Rework cfp abilities AEtherC0r3 2017-06-19 17:35:46 +03:00
  • d39ff43e4e Update shoulda-matchers to 2.8 AEtherC0r3 2017-06-15 11:34:58 +03:00
  • 559fa53415 Fix rspec tests because of the changes to the cfp AEtherC0r3 2017-06-01 01:11:28 +03:00
  • 56264ac4e6 Add index view for the cfp and modify existing ones AEtherC0r3 2017-05-31 21:03:15 +03:00
  • 4356bd0218 Modify CFP to accept proposals for other things AEtherC0r3 2017-05-30 20:54:48 +03:00
  • b6e1a336d4 Merge pull request #1553 from Ana06/fix-rubocop Ana María Martínez Gómez 2017-06-23 15:07:15 +02:00
  • 702edef3a0 Merge pull request #1516 from siddhantbajaj/PhysicalTicket Ana María Martínez Gómez 2017-06-23 13:20:46 +02:00
  • df9c6746be Merge 5d46706b90 into a925ceac35 Rob Smith 2017-06-23 08:03:45 +00:00
  • 5a178b8dad Merge 98e0a25606 into a925ceac35 nasia-sam 2017-06-23 08:02:49 +00:00
  • a925ceac35 Fix typo in bootstrap.sh AEtherC0r3 2017-06-19 14:41:52 +03:00
  • bf7e890739 Update vagrant box image to openSUSE 42.2 AEtherC0r3 2017-06-18 02:59:28 +03:00
  • ed1f219b81 Update Ruby to 2.2 AEtherC0r3 2017-06-18 02:57:39 +03:00
  • 7ebc1368ae Merge 5712ddb1b3 into 1c38b091cc Antonios Eleftheriadis 2017-06-23 06:52:17 +00:00
  • 5712ddb1b3 Fix rubocop Gemfile offense AEtherC0r3 2017-06-23 09:50:17 +03:00
  • daa83ab7fe Merge branch 'master' into ruby_upgrade Stella Rouzi 2017-06-23 09:41:13 +03:00
  • 5378b7524b Fix Style/LeadingCommentSpace Rubocop offense Ana María Martínez Gómez 2017-06-22 16:55:00 +02:00
  • 6469ea7da5 Remove default configuration from .rubocop.yml Ana María Martínez Gómez 2017-06-22 16:49:52 +02:00
  • 02f27dd4bc Fixed association between TicketPurchase and Payment Model. siddhantbajaj 2017-06-22 18:14:13 +05:30
  • d7678b2fa0 Added model test Siddhant Bajaj 2017-06-08 03:45:08 +05:30
  • 5c56683ae8 Introduced Physical Ticket Siddhant Bajaj 2017-06-03 16:05:59 +05:30
  • bf4189132a Add model-test for access of schedule_public and not_public_schedule to different user roles Chaitanya 2017-04-26 12:30:28 +05:30
  • f2af6188a1 Fix uninitialized constant selected_event error Chaitanya 2017-04-25 21:58:13 +05:30
  • f38b755e62 Don't allow not_signed_in user to view schedules if not marked as public in program Chaitanya 2017-04-22 16:12:08 +05:30
  • 6de3fdc249 Fix features/ability test Chaitanya 2017-04-21 11:08:12 +05:30
  • 7ea91d7d61 Fix models/ability test for schedules Chaitanya 2017-04-21 10:56:00 +05:30
  • 41ae0279b8 Refactor authorization for schedule action of Conferences Controller Chaitanya 2017-04-19 21:17:58 +05:30
  • 1c38b091cc Fixes for PostreSQL support Eugene Dubinin 2017-06-15 18:11:43 +03:00
  • f2c0367a74 Merge pull request #1545 from dPliakos/enable_rails_find_each Ana María Martínez Gómez 2017-06-20 10:38:29 +02:00
  • d160c22a0b Enable rails/findEach Rubocop cop Dimitris 2017-06-15 23:04:28 +03:00
  • 5dbb3044cf Fix typo in bootstrap.sh AEtherC0r3 2017-06-19 14:41:52 +03:00
  • f6a74fe771 Update vagrant box image to openSUSE 42.2 AEtherC0r3 2017-06-18 02:59:28 +03:00
  • 65edb997f9 Update Ruby to 2.2 AEtherC0r3 2017-06-18 02:57:39 +03:00
  • 98e0a25606 Modify views for booths nasia 2017-06-18 23:33:54 +03:00
  • 318c0d15a4 Refactor admin/call_for_booth controller nasia 2017-06-10 23:50:31 +03:00
  • 9103f511a7 Create tests for models nasia 2017-06-10 15:17:19 +03:00
  • 7ee9b2966a Introduce Call for Booths nasia 2017-06-06 21:36:18 +03:00
  • 66ac45efc8 Introduce Booths to OSEM nasia 2017-05-17 13:31:27 +03:00
  • 5d46706b90 Add in the database migration step to the CONTRIBUTING.md file Rob Smith 2017-06-17 10:01:14 -07:00
  • 45665b08b7 Merge branch 'master' into postgres_fixes Stella Rouzi 2017-06-16 12:00:00 +03:00
  • 4d895ae3bc Merge pull request #1541 from siddhantbajaj/travis Ana María Martínez Gómez 2017-06-16 10:04:21 +02:00
  • c5a1ad8461 Fixes for PostreSQL support Eugene Dubinin 2017-06-15 18:11:43 +03:00
  • 2f70a1ddd1 Avoid horizontal scroll bar Stella Rouzi 2017-06-13 10:22:23 +03:00
  • 195bc3cfb7 Merge branch 'master' into organizations_index_row Stella Rouzi 2017-06-15 13:14:43 +03:00
  • 0496ed23e5 Improves test speed siddhantbajaj 2017-06-14 02:46:39 +05:30
  • e3f5b48d26 Merge pull request #1543 from shlok007/update-nokogiri Ana María Martínez Gómez 2017-06-14 22:42:22 +02:00
  • bfcb1a3164 Merge pull request #1536 from divyanshumehta/issue_1531 Ana María Martínez Gómez 2017-06-14 22:41:37 +02:00
  • 58c80f1447 update nokogiri to 1.8.0 shlok007 2017-06-14 22:12:10 +05:30
  • cdf794ecbf Add Style/SelfAssignment Rubocop cop divyanshumehta 2017-06-12 22:37:45 +05:30
  • be72b9d02e Allow user to remove openid Dimitris 2017-06-10 19:36:12 +03:00
  • 2e922650a7 Merge branch 'master' into user_openid_management Stella Rouzi 2017-06-13 10:25:08 +03:00
  • cb7e0033f3 Avoid horizontal scroll bar Stella Rouzi 2017-06-13 10:22:23 +03:00
  • 703dce4f5c Merge pull request #1517 from shlok007/copy-organizations Shlok Srivastava 2017-06-12 23:21:09 +05:30
  • 6bb2143282 Merge branch 'master' into copy-organizations Shlok Srivastava 2017-06-12 22:46:53 +05:30
  • 9d4d42341c Allow user to remove openid Dimitris 2017-06-10 19:36:12 +03:00
  • 53040b3be9 Merge pull request #1498 from divyanshumehta/issue_1497 Ana María Martínez Gómez 2017-06-12 17:45:30 +02:00
  • cc5d47e6de suggested changes shlok007 2017-06-10 19:36:50 +05:30
  • 6cf9ddbdea fix failing test shlok007 2017-06-10 19:17:50 +05:30
  • 521c05af61 skip failing tests shlok007 2017-06-09 04:35:16 +05:30
  • b29856a122 suggested changes shlok007 2017-06-07 14:14:42 +05:30
  • 949f5cb591 add foreign key to conferences shlok007 2017-06-07 12:37:30 +05:30
  • cce3ff7aea creating default organization while creating a conference shlok007 2017-06-07 11:11:29 +05:30
  • 3fb316482c suggested changes shlok007 2017-06-06 20:04:39 +05:30
  • ac85bad9b3 migrate conferences to organizations shlok007 2017-06-05 11:59:27 +05:30
  • e0d8e85808 suggested changes shlok007 2017-06-05 11:56:47 +05:30
  • 8edf896d86 introduce organizations shlok007 2017-05-31 18:42:52 +05:30
  • bf54487a19 Merge pull request #1537 from shlok007/fix-haml-lint Shlok Srivastava 2017-06-12 19:28:20 +05:30
  • ce9d2b3c5b fixes failing haml-lint in admin/conference/show shlok007 2017-06-12 18:37:50 +05:30
  • 8cd3326520 Add charts about sold tickets nasia 2017-04-25 18:22:39 +03:00
  • 41503bb7a0 Compute ticket statistics AEtherC0r3 2017-04-20 09:47:19 +03:00
  • c2184c1c4f Add 'week' column to TicketPurchases AEtherC0r3 2017-04-19 16:47:59 +03:00
  • 7e84754b4c Add charts about sold tickets nasia 2017-04-25 18:22:39 +03:00
  • 1a5834d381 Compute ticket statistics AEtherC0r3 2017-04-20 09:47:19 +03:00
  • dfa1edc0d0 Add 'week' column to TicketPurchases AEtherC0r3 2017-04-19 16:47:59 +03:00
  • 9ff3601453 remove unnecessary functions selini 2017-06-11 18:15:10 +03:00
  • 071ed50acb Hide recent Registrations/Submissions when conference is over selini 2017-03-21 21:08:53 +02:00
  • 4e227b4858 Merge branch 'master' into Hide_recent_Registrations/Submissions Stella Rouzi 2017-06-12 10:14:56 +03:00
  • 1223fef87c Use of rubocop compliant unescaping methods in application_helper.rb divyanshumehta 2017-05-29 15:02:14 +05:30
  • 0d01ed08b0 Added Style/SpaceInsideBrackets Rubocop cop divyanshumehta 2017-05-29 09:32:57 +05:30
  • ac14a3e5cc remove unnecessary functions selini 2017-06-11 18:15:10 +03:00
  • 415eadf477 Merge pull request #1533 from mdeniz/split_travis_builds Ana María Martínez Gómez 2017-06-10 02:21:06 +02:00
  • ebe1ca374d Fix the Travis failure in the last PR about axlsx dependencies mdeniz 2017-06-09 14:41:51 +02:00
  • 5acb4a9339 Split in 2 jobs Travis build mdeniz 2017-06-09 14:41:44 +02:00
  • f70120cb80 Merge 466e073310 into 7a7fcced48 Chaitanya Yadav 2017-06-08 13:18:35 +00:00
  • d1b85f0041 Merge 265cc954c6 into 7a7fcced48 TheAssassin 2017-06-08 09:50:04 +00:00
  • adef747215 Merge 9696433c61 into 7a7fcced48 Siddhant Bajaj 2017-06-07 13:03:05 +00:00
  • 7a7fcced48 Replace .today with .current in program spec AEtherC0r3 2017-06-06 19:03:23 +03:00
  • cc7e17bf4a Merge 0b435e6567 into 08e5f10559 Siddhant Bajaj 2017-06-07 11:00:29 +00:00
  • 1ecd86a754 Replace .today with .current in program spec AEtherC0r3 2017-06-06 19:03:23 +03:00
  • a892d3327f Merge f4fdccd590 into 08e5f10559 Chaitanya Yadav 2017-06-06 15:44:47 +00:00
  • 5a563ee80c Merge 833a7e864d into 08e5f10559 Making GitHub Delicious 2017-06-06 15:44:46 +00:00
  • 743342c40c Merge 3d9ac5a85f into 08e5f10559 nasia-sam 2017-06-06 15:44:46 +00:00