Commit graph

  • 2ee7851ac9 Seeds db with sample organization Adriano Vieira 2017-11-04 19:35:25 -02:00
  • 668c7dede9 Add FORCE_SSL to the dotenv example James Mason 2017-11-14 14:11:57 -08:00
  • 207319ae57 Control config.force_ssl with an ENV variable James Mason 2017-11-12 17:53:00 -08:00
  • bf219ec015
    Merge pull request #1785 from bear454/test-fix James Mason 2017-11-14 14:09:21 -08:00
  • 7f369507d2
    Merge branch 'master' into test-fix James Mason 2017-11-14 12:37:33 -08:00
  • 747ecc80e9
    Merge branch 'master' into render_show_if_one_conf James Mason 2017-11-14 12:37:21 -08:00
  • 84dedb42c3
    Merge pull request #1793 from bear454/switch-transifex James Mason 2017-11-14 12:36:02 -08:00
  • 3490644a4d
    Merge branch 'master' into switch-transifex James Mason 2017-11-14 08:06:50 -08:00
  • 4785293bf1 Add hint in start and end hour in conference#edit rahul 2017-11-11 00:54:31 +05:30
  • 837d8ec0db Add popup confirmation on update button rahul 2017-10-17 20:01:15 +05:30
  • bd045c2976 added description field to cfps ViditChitkara 2017-09-05 18:15:46 +05:30
  • 599829bc0c Add hint in start and end hour in conference#edit rahul 2017-11-11 00:54:31 +05:30
  • 7d5e42ef75 Add popup confirmation on update button rahul 2017-10-17 20:01:15 +05:30
  • fba12aef24
    Only include transifex JS if the ENV var is set James Mason 2017-11-12 20:43:02 -08:00
  • 0e16b5d0ae
    Merge pull request #1790 from adrianovieira/fix_speaker.email_public James Mason 2017-11-12 17:46:39 -08:00
  • 6fa709a4de Fix to only show speaker email if it's public Adriano Vieira 2017-11-12 01:55:03 -02:00
  • f05314fa6e Ticket_button added Alexandros Pagonis 2017-11-09 19:26:01 +02:00
  • 906c05ec4e
    Merge branch 'master' into test-fix James Mason 2017-11-09 08:39:59 -08:00
  • 81831d7df9
    Merge pull request #1787 from namangupta01/program_speakers James Mason 2017-11-09 08:39:45 -08:00
  • d0dbb7d29e tests are fixed Naman Gupta 2017-11-09 02:39:41 +05:30
  • ada0f814a7 linting error is fixed Naman Gupta 2017-11-09 02:00:49 +05:30
  • 90edc648f8 programs.speakers is fixed Naman Gupta 2017-11-09 01:40:56 +05:30
  • ce4e993fe7
    Merge branch 'master' into recaptcha James Mason 2017-11-08 09:33:03 -08:00
  • 20b849d9ce
    Merge branch 'master' into test-fix James Mason 2017-11-08 09:32:19 -08:00
  • aeded80a11
    Merge pull request #1762 from namangupta01/include_speaker_email_in_events James Mason 2017-11-07 18:22:24 -08:00
  • 574ac63a05 Fix a flaky test. James Mason 2017-11-07 17:57:45 -08:00
  • aca8adf6e8
    Merge branch 'master' into include_speaker_email_in_events James Mason 2017-11-07 17:19:42 -08:00
  • 51dd5bdaa9
    Merge pull request #1757 from bear454/organization-link James Mason 2017-11-07 17:17:39 -08:00
  • 1c623b1c8a
    Merge branch 'master' into organization-link James Mason 2017-11-07 14:32:35 -08:00
  • 503ee81db0
    Merge pull request #1784 from bear454/nav-title-link James Mason 2017-11-07 14:32:23 -08:00
  • 714f89f6ba
    Fix missing link on public organizations page James Mason 2017-10-11 20:22:32 -07:00
  • 6feb2e853a
    Merge branch 'master' into nav-title-link James Mason 2017-11-07 14:09:33 -08:00
  • 170051af81
    Merge pull request #1779 from adrianovieira/update_bootstrap_for_centos James Mason 2017-11-07 13:53:53 -08:00
  • 1b8f864feb
    Use organization name for title link if available, but link to / James Mason 2017-11-07 13:51:10 -08:00
  • 04d79f65a5
    Merge branch 'master' into update_bootstrap_for_centos James Mason 2017-11-07 13:20:31 -08:00
  • 94de2e813c test is fixed Naman Gupta 2017-11-08 01:41:42 +05:30
  • 2e07462d77 exports are made to be wrap_text Naman Gupta 2017-11-08 00:49:03 +05:30
  • 721397579b added description field to cfps ViditChitkara 2017-09-05 18:15:46 +05:30
  • 9c1f65a6aa Merge 84e756ef34 into e99287d18a Vidit 2017-11-07 18:36:54 +00:00
  • 6c8ebe586c speakers_names is made in sentense using join Your Name 2017-10-17 20:54:53 +05:30
  • 52a5cb2391 speakers email field is added to pdf Your Name 2017-10-13 23:33:43 +05:30
  • 5b7aa56f6b minor changes Your Name 2017-10-13 16:08:33 +05:30
  • 7c0fa59a0a Speaker emails in Events CSV/XLS export is included Your Name 2017-10-12 23:51:58 +05:30
  • 45989db147 Merge ee4c08fc50 into e99287d18a James Mason 2017-11-07 17:18:27 +00:00
  • e99287d18a export feature for tracks and booths are done Your Name 2017-10-09 17:46:39 +05:30
  • fd6fbc17b5 export feature for tracks and booths are done Your Name 2017-10-09 17:46:39 +05:30
  • 84e756ef34 fixed comments in notifications ViditChitkara 2017-11-06 23:17:16 +05:30
  • be1992a03a typos is fixed Naman Gupta 2017-11-05 11:31:17 +05:30
  • 933fc38940 typos is fixed Naman Gupta 2017-11-05 11:31:17 +05:30
  • 3d8aeb6a52
    Merge branch 'master' into update_bootstrap_for_centos James Mason 2017-11-04 20:53:56 -07:00
  • c4fad4a181 Update bootstrap to install phantomjs on centos Adriano Vieira 2017-11-05 00:55:07 -02:00
  • 02709597a2 Update bootstrap for centos box Adriano Vieira 2017-11-04 22:13:19 -02:00
  • 0aa782711d
    Use 'Feature's to toggle optional functionality James Mason 2017-11-03 20:37:42 -07:00
  • a7fce677fc
    Add reCAPTCHA support to registration. James Mason 2017-11-03 17:41:26 -07:00
  • 464b148321
    Merge pull request #1772 from namangupta01/error_opening_link_to_difficulty_level James Mason 2017-11-03 11:57:27 -07:00
  • ae0538e1ad
    Merge branch 'master' into error_opening_link_to_difficulty_level James Mason 2017-11-03 11:25:29 -07:00
  • 03aed464c9 Merge cccbdb2120 into f0016cb6b5 James Mason 2017-11-03 17:51:15 +00:00
  • ee4c08fc50
    Merge branch 'master' into one-organization James Mason 2017-11-03 10:50:20 -07:00
  • 10c8a8e342
    Use organization name for title link if available, but link to / James Mason 2017-10-19 10:44:21 -07:00
  • f0016cb6b5
    Merge pull request #1621 from namangupta01/master James Mason 2017-11-03 08:48:35 -07:00
  • a0e3ea75ed consecutive ruby lines are made into the ruby filter Naman Gupta 2017-11-02 21:44:12 +05:30
  • e607aca680 user ability for registration is used for chcking whether a user can register or not Your Name 2017-10-13 02:39:36 +05:30
  • b1f32caf7c speaker is only ask to register when registrations are open and speaker haven't registered yet namangupta01 2017-08-06 01:13:14 +05:30
  • 01abbfecc4 Speaker is ask to register only when registration_period is set namangupta01 2017-08-04 01:29:30 +05:30
  • 09941c76c3
    Merge pull request #1662 from tobru/openshift_compatibility James Mason 2017-11-02 09:38:35 -07:00
  • 2b7066cd8b
    Merge branch 'master' into openshift_compatibility James Mason 2017-11-02 08:23:24 -07:00
  • 07abd88c1c Added check for payment date in ability.tb rishabhptr 2017-11-01 20:34:21 +05:30
  • 739b0fc9a8 Merge d66ff9a806 into e300932512 Stella Rouzi 2017-10-31 18:39:56 +00:00
  • d66ff9a806 line 76 Complete to Improve Astradeni 2017-10-22 16:32:30 +03:00
  • 00eaaeecf3 Add mass import of commercials Stella Rouzi 2017-01-11 16:45:58 +02:00
  • e300932512
    Merge pull request #1513 from hennevogel/master James Mason 2017-10-27 19:46:26 -07:00
  • 7048a37eb6
    Merge branch 'master' into master James Mason 2017-10-27 18:26:21 -07:00
  • f4a428a58d
    Merge branch 'master' into master James Mason 2017-10-27 18:08:15 -07:00
  • 1d07125e7d Merge pull request #1701 from rahul2240/amount Ana María Martínez Gómez 2017-10-27 14:22:40 +02:00
  • 2a285b329f configuration comments for postgres, mysql and sqlite created. Akshit Ahluwalia 2017-10-25 09:13:03 +05:30
  • 77d8bfe496 styling failing error is corrected Naman Gupta 2017-10-22 17:02:17 +05:30
  • 88f33728db Added when only one conference root path goes to show page alator21 2017-10-22 14:41:28 +03:00
  • 0cd8d21611 minor changes Naman Gupta 2017-10-22 16:30:54 +05:30
  • 15813f9be6 difficulty level code redundancy is removed Naman Gupta 2017-10-22 13:09:43 +05:30
  • d00dc631f8 Error opening link to difficulty level in Revision history is removed Naman Gupta 2017-10-21 02:42:08 +05:30
  • 7f6e818d51 Merge f1e8d741c2 into 885ebc4186 nasia-sam 2017-10-20 20:01:52 +00:00
  • 885ebc4186 Merge pull request #1723 from namangupta01/error_opening_revision_history James Mason 2017-10-20 13:01:35 -07:00
  • aaa34c64af link is corrected Naman Gupta 2017-10-20 23:38:59 +05:30
  • 021564d3db Merge branch 'master' into openshift_compatibility James Mason 2017-10-19 18:26:01 -07:00
  • c33520dbdf Merge branch 'master' into error_opening_revision_history James Mason 2017-10-19 15:37:35 -07:00
  • 5e0cffb811 Merge pull request #1699 from tobru/currency_chf James Mason 2017-10-19 15:37:15 -07:00
  • cccbdb2120
    Split features into separate travis job James Mason 2017-10-19 12:26:53 -07:00
  • 33ccef59d5 Trying to improve Travis run times. James Mason 2017-10-13 11:32:22 -07:00
  • 6db3647ea6 Trying travis without sudo - should run in container James Mason 2017-10-12 09:13:17 -07:00
  • 23805abffe Merge branch 'master' into error_opening_revision_history James Mason 2017-10-19 12:11:32 -07:00
  • 58f7e60dba Merge branch 'master' into currency_chf James Mason 2017-10-19 11:55:30 -07:00
  • 7113d2440e Merge pull request #1770 from ud-jindal/master James Mason 2017-10-19 10:07:09 -07:00
  • 613351378f Merge branch 'master' of https://github.com/openSUSE/osem Udit Jindal 2017-10-19 01:46:15 +05:30
  • 3d8b32d90b fixed doubly typed route Udit Jindal 2017-10-19 01:41:40 +05:30
  • f1e8d741c2 Merge branch 'master' into new_fields_to_sponsors James Mason 2017-10-17 19:26:53 -07:00
  • 9cdf8398c1 Merge branch 'master' into master James Mason 2017-10-17 19:14:12 -07:00
  • caf2215f5b Merge branch 'master' into currency_chf James Mason 2017-10-17 07:14:13 -07:00
  • f41651a6e8 Merge 6e63afe40f into f44e6e5ca5 Rahul 2017-10-17 12:49:35 +00:00
  • f44e6e5ca5 fixed openid username ViditChitkara 2017-10-13 22:30:08 +05:30
  • 8caf86de00 fixed openid username ViditChitkara 2017-10-13 22:30:08 +05:30