Commit graph

  • e96a5338e2 Attempting to stabilize another flaky test. James Mason 2017-10-13 10:39:10 -07:00
  • 8ddcd695f0 Add vendor picture interface; include in splash James Mason 2017-10-11 16:47:51 -07:00
  • b80f60ed33 Merge branch 'master' into openshift_compatibility James Mason 2017-10-16 08:24:03 -07:00
  • 945433d3af Merge branch 'master' into venue-picture James Mason 2017-10-16 08:19:07 -07:00
  • bded0211f7 Merge 590c3a91ea into eaa8ad8005 Shlok Srivastava 2017-10-16 15:18:43 +00:00
  • eaa8ad8005 Merge pull request #1766 from rahul2240/venue James Mason 2017-10-16 08:18:33 -07:00
  • 03c9f7deb1 Add turnover for admin rahul 2017-09-25 00:55:09 +05:30
  • 0d70832f5b Add total amount spent by user rahul 2017-09-25 00:52:13 +05:30
  • b761e83b45 Add amount paid rahul 2017-09-25 00:38:20 +05:30
  • 3f3cdef520 Fix decimal limit of total to 2 rahul 2017-09-25 00:34:53 +05:30
  • 33bfb3d3c2 Add link to venue when venue is not set rahul 2017-10-14 20:41:41 +05:30
  • 6e63afe40f Add popup message before eventschedule hours change rahul 2017-10-02 17:22:12 +05:30
  • 23cc94a015 Merge branch 'master' into venue-picture James Mason 2017-10-13 18:48:51 -07:00
  • 2f8454a837 Merge pull request #1760 from rishabhptr/role-link James Mason 2017-10-13 12:03:49 -07:00
  • fc72d9e84c Merge branch 'master' into role-link James Mason 2017-10-13 11:40:34 -07:00
  • 09bf256a8c Attempting to stabilize another flaky test. James Mason 2017-10-13 10:39:10 -07:00
  • 21cbedb849 Add vendor picture interface; include in splash James Mason 2017-10-11 16:47:51 -07:00
  • fc64542202 Stabilizing a randomly failing test James Mason 2017-10-12 14:06:02 -07:00
  • f2b5c2627c Require a version of nokogiri with known vulnerabilities resolved James Mason 2017-10-10 10:34:16 -07:00
  • 5a01245ddd Adding issue and pull request templates Akshit Ahluwalia 2017-10-13 17:16:34 +05:30
  • 6ad5b6f44f
    Stabilizing a randomly failing test James Mason 2017-10-12 14:06:02 -07:00
  • 439760724f Require a version of nokogiri with known vulnerabilities resolved James Mason 2017-10-10 10:34:16 -07:00
  • d146fba2fe Merge ce57ae2df9 into 1ac751fc7b Stephanie 2017-10-12 16:44:03 +00:00
  • 1ac751fc7b Merge pull request #1745 from namangupta01/adding_ds_store_to_gitignore James Mason 2017-10-12 09:43:38 -07:00
  • d4492138b2 Merge branch 'master' into adding_ds_store_to_gitignore James Mason 2017-10-12 09:14:59 -07:00
  • c3cf936463 Merge pull request #1737 from ViditChitkara/byebug James Mason 2017-10-12 09:14:22 -07:00
  • dad7aba973 Merge branch 'master' into byebug James Mason 2017-10-12 08:50:09 -07:00
  • 3cf44587a7 Merge branch 'master' into adding_ds_store_to_gitignore James Mason 2017-10-12 08:49:20 -07:00
  • 49503444e1 Fixed roles link in revision_history rishabhptr 2017-10-12 21:17:23 +05:30
  • 6d02af3f9b Merge pull request #1755 from akshitahluwalia/hakiri-fix James Mason 2017-10-12 08:36:51 -07:00
  • fc48769abb fixed hakiri xss warnings. Akshit Ahluwalia 2017-10-12 04:40:57 +05:30
  • 3b41c61fca Merge 3c33876682 into 904ab8d4d5 James Mason 2017-10-11 08:58:08 +00:00
  • 3c33876682 Merge branch 'master' into security-issues James Mason 2017-10-11 01:58:06 -07:00
  • 904ab8d4d5 Merge pull request #1754 from bear454/fix-tests Christian Bruckmayer 2017-10-11 10:57:30 +02:00
  • d95a786d9f
    Fix intermittent failures in track tests James Mason 2017-10-10 20:23:54 -07:00
  • d5d9ca16e0
    Require a version of nokogiri with known vulnerabilities resolved James Mason 2017-10-10 10:34:16 -07:00
  • c48f458a80
    Sanitize venue location attributes to prevent XSS JS injection James Mason 2017-10-10 10:25:49 -07:00
  • 9b5a6ddb5c
    Sanitize conference color to prevent CSS XSS injection James Mason 2017-10-10 10:22:49 -07:00
  • 741ead5e17
    Sanitize venue website link James Mason 2017-10-10 10:18:05 -07:00
  • 9171beabf8 Added check for conference end_date in payments#new rishabhptr 2017-10-10 21:51:24 +05:30
  • 36133a995a DS_Store file is added into the gitignore Your Name 2017-10-09 18:37:45 +05:30
  • e9109614ed error opening revision history is removed Your Name 2017-10-09 18:24:36 +05:30
  • 78eb58c93e event export options are grouped Your Name 2017-10-08 20:06:06 +05:30
  • fa78de2cae event export options are grouped Your Name 2017-10-08 20:06:06 +05:30
  • 3b27a2a8fb Added amount check for payments#new rishabhptr 2017-10-02 20:08:30 +05:30
  • 72afae6f2f fixed error in nested comments ViditChitkara 2017-10-07 02:34:46 +05:30
  • 54ee5dad9e fixed error in nested comments ViditChitkara 2017-10-07 02:34:46 +05:30
  • f4a084ec54 added byebug_history to gitignore ViditChitkara 2017-10-02 22:11:23 +05:30
  • e771b0ca84 Added amount check for payments#new rishabhptr 2017-10-02 20:08:30 +05:30
  • d6c7e8d97f Fixed email overflow bug in tickets pdf ViditChitkara 2017-09-26 18:30:36 +05:30
  • 99e5af3217 Add full address to the ticket rahul 2017-09-12 18:10:16 +05:30
  • 8dd5a14b23 Remove to_s from conference.venue.name rahul 2017-09-12 17:52:01 +05:30
  • ec91db86f9 Fix error while generating pdf when venue is nil rahul 2017-09-11 23:01:28 +05:30
  • be6bfb6aad Add missing : to booths and events_cfp rahul 2017-09-10 20:03:18 +05:30
  • 407b1838cf Add cfp type in admin/cfp#show rahul 2017-09-09 16:13:17 +05:30
  • 568d89b620 Changed physical_ticket to plural rishabhptr 2017-09-26 21:43:18 +05:30
  • 2247231d6e Added amount check for payments#new rishabhptr 2017-09-25 21:30:46 +05:30
  • 7fa478403b Fixed email overflow bug in tickets pdf ViditChitkara 2017-09-26 18:30:36 +05:30
  • 6fef10a5a6 Merge 92d7fe73ae into 7e9d1dbf84 Sagarpreet Chadha 2017-10-01 19:01:11 +00:00
  • 92d7fe73ae issue fixed for downloading PDF if Venue not given sagarpreet-chadha 2017-10-02 00:08:47 +05:30
  • 70ae8a66aa Changed physical_ticket to plural rishabhptr 2017-09-26 21:43:18 +05:30
  • ee9285d243 Fixed PDF downloading when venue is not entered Sagarpreet Chadha 2017-10-01 23:44:48 +05:30
  • fb2240149b Merge branch 'master' into genpdf Stella Rouzi 2017-10-01 20:03:06 +03:00
  • f9e602802e Merge branch 'master' into cfg Stella Rouzi 2017-10-01 20:03:01 +03:00
  • ce57ae2df9 Merge pull request #2 from caisca/username Stephanie 2017-09-29 15:41:05 -07:00
  • 62b292a122 Merge fafadb4e26 into 7e9d1dbf84 Stephanie 2017-09-29 22:40:31 +00:00
  • fafadb4e26 add full name Stephanie Wilkinson 2017-09-29 15:40:04 -07:00
  • f29cee245d change location Stephanie Wilkinson 2017-09-29 15:38:05 -07:00
  • 246860d44e add background image to conf page Stephanie Wilkinson 2017-09-29 15:15:02 -07:00
  • 1d55e6edb0 name swap Stephanie Wilkinson 2017-09-29 14:59:40 -07:00
  • a531e15735 tweaks to homepage Stephanie Wilkinson 2017-09-29 14:46:32 -07:00
  • a820896b51 remove sillier text Stephanie Wilkinson 2017-09-29 14:34:38 -07:00
  • cf2d80c4e2 change from triangles to solid background Stephanie Wilkinson 2017-09-29 14:29:43 -07:00
  • 1537d5f290 add styling Stephanie Wilkinson 2017-09-29 14:03:21 -07:00
  • 32abe5f196 add fallback for trackless events Stephanie Wilkinson 2017-09-29 13:49:49 -07:00
  • 30c080ac65 rework registrations page Stephanie Wilkinson 2017-09-29 12:39:35 -07:00
  • a05924b94b remove username stuff and changed heart icon Stephanie Wilkinson 2017-09-29 12:14:47 -07:00
  • dd38cf175f remove footer Stephanie Wilkinson 2017-09-29 11:46:28 -07:00
  • 4e1d1d1536 Merge pull request #1 from caisca/remove-travel Stephanie 2017-09-29 11:41:32 -07:00
  • 6b2807c415 Merge 5e2adebead into 7e9d1dbf84 Stephanie 2017-09-29 18:40:19 +00:00
  • 5e2adebead remove travel stuff Stephanie Wilkinson 2017-09-29 11:39:35 -07:00
  • d548852db5 change form fields in view Stephanie Wilkinson 2017-09-29 10:15:34 -07:00
  • c97d2f42b8 added pg example database yml Stephanie Wilkinson 2017-09-28 16:06:06 -07:00
  • a979c64c3e got it working, switched from mysql to pg Stephanie Wilkinson 2017-09-28 15:49:54 -07:00
  • bed7390674 Added amount check for payments#new rishabhptr 2017-09-25 21:30:46 +05:30
  • 1ce34ce442 Merge 3d19073a46 into 7e9d1dbf84 Naman Gupta 2017-09-20 20:37:23 +00:00
  • 7e9d1dbf84 Merge pull request #1642 from siddhantbajaj/user-present Ana María Martínez Gómez 2017-09-20 22:37:07 +02:00
  • 7bfb073702 Merge pull request #1710 from rahul2240/ajax-round Ana María Martínez Gómez 2017-09-20 22:34:55 +02:00
  • a07df4bdb0 Fix decimal numbers limit to 2 rahul 2017-09-20 21:38:34 +05:30
  • 9eeb482190 Merge pull request #1708 from rahul2240/total Ana María Martínez Gómez 2017-09-19 10:21:13 +02:00
  • 82b5f9083a Fix total price for tickets rahul 2017-09-18 19:07:13 +05:30
  • ac0a33c2b6 Merge pull request #1698 from ViditChitkara/schedule-error Ana María Martínez Gómez 2017-09-17 22:41:37 +02:00
  • c9b70c22ed add CHF currency Tobias Brunner 2017-09-15 22:42:14 +02:00
  • c929d8e68b fixed schedule-page error ViditChitkara 2017-09-15 15:13:55 +05:30
  • ec8fbb21d7 Showing of tracks when there are no tracks in proposals is fixed Closes #1668 namangupta01 2017-08-31 13:43:08 +05:30
  • c317565ec7 proposals#edit form text in track field is added namangupta01 2017-09-07 23:44:27 +05:30
  • 69e30e7ba9 Improving check-in process siddhantbajaj 2017-08-22 14:57:42 +05:30
  • 20c525f3bc proposals#edit form text in track field is added namangupta01 2017-09-07 23:44:27 +05:30
  • ca5d139dc2 Merge pull request #1695 from rahul2240/revhistory Ana María Martínez Gómez 2017-09-13 00:19:05 +02:00
  • 399d453a81 Add full address to the ticket rahul 2017-09-12 18:10:16 +05:30