Commit graph

  • e0e7d83aa0 Merge pull request #1270 from siddhantbajaj/schedule Stella Rouzi 2017-02-16 10:48:56 +02:00
  • 1d4615e297 fixed schedule creation Siddhant Bajaj 2017-02-16 00:01:40 +05:30
  • 3a9d7b9e1f fixed dropdown issues on Event Index page Siddhant Bajaj 2017-02-15 23:43:17 +05:30
  • 289a8393c8 fixed dropdown issue Siddhant Bajaj 2017-02-15 23:39:02 +05:30
  • 36f97ad5e5 Added task for set email_public attribute true for all users JewelSam 2017-02-15 18:07:44 +03:00
  • e57c83c355 Added reverse method to migration JewelSam 2017-02-15 18:07:20 +03:00
  • 56c69f51b7 #1040 Show email in public option JewelSam 2017-02-14 17:54:31 +03:00
  • 466e073310 Add information about way to confirm account via mail in development Chaitanya 2017-02-14 19:11:48 +05:30
  • a0120734e3 Merge pull request #1287 from sheamunion/issue-1273 Hernán Schmidt 2017-02-12 19:59:52 +01:00
  • 26a83d4a2e Merge pull request #1292 from shlok007/rename Stella Rouzi 2017-02-12 16:21:03 +02:00
  • a2b3396897 rename intersecting_events to intersecting_event_schedules shlok007 2017-02-12 19:10:03 +05:30
  • 1cb51d59ca Fixed Issue #1259 divyanshumehta 2017-02-12 13:47:32 +05:30
  • c3ac72f0af Issue #1259 divyanshumehta 2017-02-11 16:45:27 +05:30
  • efa314befd Merge branch 'issue-1273' of https://github.com/sheamunion/osem into issue-1273 Shea Munion 2017-02-09 14:04:18 -06:00
  • 083efc3016 - Revert change to Conference :short_title validation - 'short_title' field in new view accepts a-zA-Z0-9_- Shea Munion 2017-02-09 13:58:11 -06:00
  • ef5196b67d - Revert change to Conference :short_title validation - 'short_title' field in new view accepts a-zA-Z0-9_- Shea Munion 2017-02-09 13:58:11 -06:00
  • f1c66508e2 'short title' hint, pattern & title attr accept a-z0-9_- & prepend URL. Shea Munion 2017-02-09 13:51:32 -06:00
  • 0296a1e70d Merge pull request #1277 from BelieveC/master Stella Rouzi 2017-02-09 11:49:42 +02:00
  • f42e4adc45 Merge pull request #1261 from shlok007/resources Ana María Martínez Gómez 2017-02-09 10:45:51 +01:00
  • c38cabe06e Fixes #1260, Changes behavior of proposal update page requirement field BelieveC 2017-02-07 19:45:49 +05:30
  • 6db2e8abe7 remove input field from admin/resource#index shlok007 2017-02-09 01:11:24 +05:30
  • 716b4826a7 Merge 9c1126b88a into bee4dc9038 Chaitanya Yadav 2017-02-08 19:26:42 +00:00
  • ddcfd769a9 Merge 9221f92b19 into bee4dc9038 Nishanth Vijayan 2017-02-08 18:38:35 +00:00
  • 5c198a11aa Merge 17aa374b99 into bee4dc9038 Anitha Palanisamy 2017-02-08 18:38:34 +00:00
  • bee4dc9038 Merge pull request #1281 from sheamunion/issue-1273 Hernán Schmidt 2017-02-08 19:38:25 +01:00
  • 1d4140099f Remove dash from regex for short_title format validation. Shea Munion 2017-02-08 12:23:30 -06:00
  • c822d65010 Title attr aligns with hint text. Prepend field with conferences_url. Shea Munion 2017-02-08 12:13:01 -06:00
  • 051e99aca4 Merge pull request #1280 from sheamunion/issue-1272 Hernán Schmidt 2017-02-08 08:58:17 +01:00
  • f416f0edab Add pattern & title attr to 'short title' field & prepended URL. Shea Munion 2017-02-07 19:38:39 -06:00
  • 96cfc036bc Remove superfluous 'sign in' link. Shea Munion 2017-02-07 19:26:51 -06:00
  • a9f3c97cf2 Merge pull request #1279 from JewelSam/master Hernán Schmidt 2017-02-07 22:45:34 +01:00
  • 0e55a7a3ac #1271 - made 'Remember me' label clickable JewelSam 2017-02-07 19:36:13 +03:00
  • 9c1126b88a Merge remote-tracking branch 'upstream/master' BelieveC 2017-02-07 17:49:28 +05:30
  • 843d8ba953 Fixes #1260,Change behavior of requirement field of proposal update page BelieveC 2017-02-07 17:45:33 +05:30
  • 3f3e71f43a Fixes #1260 ,Change proposal update page's requirement field behavior BelieveC 2017-02-07 01:40:28 +05:30
  • ddc9ed9dc6 implements configurable schedule granularity and improves the schedule grid for denser schedule grids on smaller screens Eugene Dubinin 2017-01-17 14:46:12 +02:00
  • 3065766da9 ability to track resources used in conference shlok007 2017-02-06 16:11:22 +05:30
  • db6222715b Merge pull request #1262 from nikhilgupta1211/rubocop_changes Ana María Martínez Gómez 2017-02-07 09:46:45 +01:00
  • 8da04ab4b1 Fix Vagrant File BelieveC 2017-02-07 01:43:30 +05:30
  • 33d975514f Fix Update page page: Requirement field fixed to collapse for empty description BelieveC 2017-02-07 01:40:28 +05:30
  • 4a9c971ec7 Enable Style/SpaceAroundOperators Rubocop gotens1211 2017-02-01 20:47:35 +05:30
  • a82f33fc0e Merge 92750a4a2b into 945b4aac60 Nemo 2017-02-01 20:47:57 +00:00
  • 92750a4a2b Adds domain support to OSEM Abhay Rana 2017-02-02 02:12:49 +05:30
  • 945b4aac60 Merge pull request #1249 from commandprompt/configurable_schedules Ana María Martínez Gómez 2017-02-01 15:41:28 +01:00
  • ff9ca4a817 implements configurable schedule granularity and improves the schedule grid for denser schedule grids on smaller screens Eugene Dubinin 2017-01-17 14:46:12 +02:00
  • f1e37df5a0 Merge 514a88e0be into a4ef10cf1b Anitha Palanisamy 2017-01-31 13:57:04 +00:00
  • a4ef10cf1b Merge pull request #1118 from rishabhs95/free-ticket Hernán Schmidt 2017-01-31 14:54:18 +01:00
  • 0e6630c40f Merge 9379586fad into 4089f16f17 Stella Rouzi 2017-01-31 09:32:01 +00:00
  • 4089f16f17 Merge pull request #1253 from differentreality/1113 Ana María Martínez Gómez 2017-01-31 10:08:38 +01:00
  • b8662a736f Merge d8e2ad594a into 45c3c73e57 Arun Kumar 2017-01-29 22:57:35 +00:00
  • 241bc89293
    repair code reviews Rishabh Saxena 2016-11-22 14:43:59 +05:30
  • 24582706be Merge 37edffe7de into 45c3c73e57 Ana María Martínez Gómez 2017-01-26 15:36:04 +00:00
  • 45c3c73e57 Merge pull request #1255 from shlok007/display-paid-and-unpaid-tickets Ana María Martínez Gómez 2017-01-26 16:27:24 +01:00
  • d974807134 Display paid and unpaid tickets in admin/tickets#show shlok007 2017-01-23 09:19:15 +05:30
  • 22e0c1d8f8 makes rubocop happy Eugene Dubinin 2017-01-23 17:23:37 +02:00
  • b86c03f898 implements adding the proposal by admin users Eugene Dubinin 2017-01-19 17:05:25 +02:00
  • 296eefd1c2 updated devise to 4.2.0 shlok007 2017-01-21 09:36:05 +05:30
  • 5111d9e937 Extract checking if event is replacement to event_schedule model Nishanth Vijayan 2016-08-15 17:17:57 +05:30
  • 9c7591adcd Add cancel/replacement labels in All Events Nishanth Vijayan 2016-07-31 16:23:25 +05:30
  • 093acfe697 Merge af08dabc12 into 2a0e1b5dea Charlie Quinn 2017-01-19 10:28:18 +00:00
  • 2a0e1b5dea Merge pull request #1251 from Ana06/schedule-bug Stella Rouzi 2017-01-19 12:21:21 +02:00
  • e61acde1e2 Fix bug in the schedule Ana María Martínez Gómez 2017-01-18 23:13:12 +01:00
  • 4a75546e6c Merge pull request #1246 from Ana06/db_cleaning Christian Bruckmayer 2017-01-17 14:22:26 +01:00
  • 46101228e7 Merge pull request #1169 from nishanthvijayan/reports Stella Rouzi 2017-01-15 12:28:38 +02:00
  • 37edffe7de Add validation to avoid overlapping Ana 2016-08-23 02:20:16 +02:00
  • eea35c5578 Avoid overlapping in the admin schedule Ana 2016-08-23 00:39:08 +02:00
  • bcff982d3d Introduce bulk :create, :update and :destroy Ana 2016-08-18 00:27:52 +02:00
  • 10561129f9 Move save button Ana 2016-08-12 21:35:21 +02:00
  • 6f0cdc64c3 Introduce a "Save" button for the admin schedule Ana 2016-07-22 17:57:26 +02:00
  • de2e316fee Merge pull request #1244 from AEtherC0r3/fix_table Stella Rouzi 2017-01-11 19:47:52 +02:00
  • 845c9234e9 Merge pull request #1245 from AEtherC0r3/fix_id Stella Rouzi 2017-01-11 19:46:31 +02:00
  • e4104ba2cd Fix the Travis failures in rspec Ana María Martínez Gómez 2017-01-11 10:01:09 +01:00
  • 7ebf44d1e4 Improvements in the DatabaseCleaner Ana María Martínez Gómez 2017-01-10 18:29:25 +01:00
  • ca442dcb90 Amend version tests to show correct event name AEtherC0r3 2017-01-10 23:51:32 +02:00
  • e5687c4504 Find correct event id in versions AEtherC0r3 2017-01-10 22:07:40 +02:00
  • e514a8c30a Adds table header in admin/events#index AEtherC0r3 2017-01-10 21:30:00 +02:00
  • 052cfebf4e Merge pull request #1237 from AEtherC0r3/template_subject Stella Rouzi 2017-01-10 12:51:10 +02:00
  • aaa2571eb5 Changes email templates in admin/emails#index AEtherC0r3 2017-01-05 00:09:04 +02:00
  • c0b7a70e6e Load template loads subject desantonop 2016-10-06 18:48:02 +03:00
  • d2e177cac4 Testing if I can squash this way (#1) Chris Niedzwiedz 2017-01-09 12:27:11 -06:00
  • f67a721f20 Merge pull request #1232 from mwgalloway/error-pages Christian Bruckmayer 2017-01-09 17:56:37 +01:00
  • 5f080cf6db Merge pull request #1134 from Ana06/all-events-links Christian Bruckmayer 2017-01-09 17:54:30 +01:00
  • d6618fd3af Merge pull request #1136 from differentreality/fix_voting Christian Bruckmayer 2017-01-09 17:53:18 +01:00
  • 0e8406be74 Update index.html.haml_spec.rb Chris Niedzwiedz 2017-01-09 09:31:28 -06:00
  • 28341de3fa Update show.html.haml_spec.rb Chris Niedzwiedz 2017-01-09 09:30:45 -06:00
  • 59005f3f81 Update show.html.haml_spec.rb Chris Niedzwiedz 2017-01-09 09:30:28 -06:00
  • f49ebf634f Updating quotes Chris Niedzwiedz 2017-01-07 00:33:37 -06:00
  • a0eaf75e9a Updating quotes Chris Niedzwiedz 2017-01-07 00:32:45 -06:00
  • 3d8b743563 Updating quotes Chris Niedzwiedz 2017-01-07 00:32:08 -06:00
  • 025f175276 Fixed XSS from markdown() chrniedz 2017-01-06 17:15:50 -06:00
  • 436c4fd972 Fixed XSS from markdown() chrniedz 2017-01-06 17:06:21 -06:00
  • a42240b5a6 Fixed XSS resulting from markdown() method chrniedz 2017-01-06 16:58:18 -06:00
  • cf5d4e4dbe Make links inside event-panel work with ctrl+click Ana 2016-08-11 12:43:10 +02:00
  • 514a88e0be display current events based on track AnithaPal 2016-09-26 14:46:46 -04:00
  • e82a3e1727 created current scope in event_schedule model and conference info link name and path changed AnithaPal 2016-08-23 10:23:26 -04:00
  • e8d3177ec1 method added to autocycle through sponsors based on sponsor level and code added to inherit twitter env variables AnithaPal 2016-08-01 15:44:01 -04:00
  • 881518f1f3 cycle method added to auto cycle through tweets and exception handling is modified to capture all errors that raise from twitter AnithaPal 2016-07-27 17:02:40 -04:00
  • f29a15b8e4 twitter gem and a partial added to embed tweets about a conference and new layout added for conference info screen AnithaPal 2016-07-20 15:11:50 -04:00
  • febd3451ad is_current method added to check an event is current and function addded to refresh conference_wide_information AnithaPal 2016-07-15 16:28:03 -04:00
  • 35afdcead4 added conference wide information page and linked to the admin sidebar AnithaPal 2016-07-06 15:30:39 -04:00