Commit graph

  • 3e07c8b66b
    Add helper for event switch checkboxes James Mason 2018-02-13 18:12:30 -08:00
  • 69fd90bd50
    Use helpers for repeated event dropdown links James Mason 2018-02-13 16:33:11 -08:00
  • 631f100b1b
    Remove blind_voting overreach James Mason 2018-02-13 10:38:30 -08:00
  • 290def3786
    Clean up rating partials James Mason 2018-02-09 17:19:33 -08:00
  • 73c5c3c97a Allow root URL to redirect to a conference via ENV var. James Mason 2018-03-03 21:36:20 -08:00
  • f062f7f4ee Reduce deprecation warnings James Mason 2018-03-01 19:00:41 -08:00
  • 42e0b58161 Remove version suffix from binstubs Henne Vogelsang 2018-03-14 23:23:43 +01:00
  • 4b7dbfbde6
    Merge 30de487872 into 7944494f74 David Sedeño 2018-03-15 00:00:36 +00:00
  • 7944494f74 Add metadata for specifying a gemset for rvm James Mason 2018-02-27 17:56:07 -08:00
  • 00242fb2a5
    Merge branch 'master' into root-override Henne Vogelsang 2018-03-15 00:01:30 +01:00
  • 371ffe0d09
    Merge branch 'master' into deprecations Henne Vogelsang 2018-03-15 00:01:23 +01:00
  • 2655cb6b0a
    Merge branch 'master' into rvm-gemset-metadata Henne Vogelsang 2018-03-15 00:01:14 +01:00
  • cb7960fc3f Prevent error when parsing empty params hash James Mason 2018-03-13 14:29:32 -07:00
  • 0865b39c38 Add timestamps to tickets James Mason 2018-03-12 18:24:09 -07:00
  • ca750ee9b3
    Merge branch 'master' into root-override Henne Vogelsang 2018-03-14 23:56:57 +01:00
  • 34ab6370ad
    Merge branch 'master' into deprecations Henne Vogelsang 2018-03-14 23:54:50 +01:00
  • fc8ff87d99
    Merge branch 'master' into rvm-gemset-metadata Henne Vogelsang 2018-03-14 23:53:38 +01:00
  • 1b226f1ac8 Fix NoMethodError in revision history rahul2240 2018-01-07 21:19:21 +05:30
  • fd3e3adae4
    Remove version suffix from binstubs Henne Vogelsang 2018-03-14 23:23:43 +01:00
  • 764c03e692
    Merge branch 'master' into new Henne Vogelsang 2018-03-14 23:14:34 +01:00
  • bf896a136a
    Merge branch 'master' into ticket-currency-bug Henne Vogelsang 2018-03-14 22:46:53 +01:00
  • b2f9b6790a
    Merge 0fdef06ebf into 137d997793 Vidit 2018-03-14 21:34:28 +00:00
  • 9f28fc800f
    Merge ff16668941 into 137d997793 sspsk 2018-03-14 21:29:16 +00:00
  • e393577cf3
    Prevent error when parsing empty params hash James Mason 2018-03-13 14:29:32 -07:00
  • 685a983df7
    Add timestamps to tickets James Mason 2018-03-12 18:24:09 -07:00
  • a162e889a3
    Merge f67983b806 into 137d997793 Naman Gupta 2018-03-11 20:44:14 +00:00
  • 53b04de3f9
    Merge 2899e414fb into 137d997793 Naman Gupta 2018-03-11 20:44:08 +00:00
  • 28aab31c42
    Merge dcaf074753 into 137d997793 Shlok Srivastava 2018-03-11 19:42:58 +00:00
  • 6d2fb01a7b
    Merge 95a0986c02 into 137d997793 alator21 2018-03-09 02:36:53 +00:00
  • 0b0a6456f2
    Add metadata for specifying a gemset for rvm James Mason 2018-02-27 17:56:07 -08:00
  • d41258bb90
    Ignoring rubocop rules for Ruby 3. James Mason 2018-02-23 11:57:26 -08:00
  • fc146a1371
    Allow root URL to redirect to a conference via ENV var. James Mason 2018-03-03 21:36:20 -08:00
  • d92ec156de
    Reduce deprecation warnings James Mason 2018-03-01 19:00:41 -08:00
  • 137d997793 Don't use external youtube resources in test James Mason 2018-02-25 16:31:55 -08:00
  • 9bb9d954b3
    Merge branch 'master' into youtube-requests James Mason 2018-03-05 22:47:44 -08:00
  • 913210347f Add error msg for null file while Adding Commercial for event AnkushMalik 2018-01-12 17:41:20 +05:30
  • 57d0b5b5e8
    Merge branch 'master' into develop James Mason 2018-03-02 10:15:54 -08:00
  • 4bcb93ae7b
    Don't use external youtube resources in test James Mason 2018-02-25 16:31:55 -08:00
  • 59f6d94366 Update INSTALL.md with Ruby version requirement Stella Rouzi 2018-02-23 13:34:12 +02:00
  • 20385ff1e4
    Merge branch 'master' into develop James Mason 2018-03-02 09:47:20 -08:00
  • 193b89873f
    Merge branch 'master' into installatiion_instructions James Mason 2018-03-02 09:42:27 -08:00
  • 44fd794416 Make test organization names more unique James Mason 2018-02-28 09:34:43 -08:00
  • d563cd17a7
    Make test organization names more unique James Mason 2018-02-28 09:34:43 -08:00
  • 3e87d0ea32
    Merge 9b65ace24b into b1960c08ef James Mason 2018-02-28 16:41:23 +00:00
  • 9b65ace24b
    Add metadata for specifying a gemset for rvm James Mason 2018-02-27 17:56:07 -08:00
  • f6fda124fa
    Merge branch 'master' into installatiion_instructions James Mason 2018-02-28 08:38:52 -08:00
  • b1960c08ef Added name uniqueness validation for organization model. Marie-Elise 2018-01-15 22:14:22 -06:00
  • f67983b806
    Merge branch 'master' into navbar_collapse Naman Gupta 2018-02-28 01:23:01 +05:30
  • 7543761bf9
    Merge branch 'master' into make-org-name-unique James Mason 2018-02-27 11:50:01 -08:00
  • 5eb5035dd5
    Merge branch 'master' into installatiion_instructions James Mason 2018-02-27 11:13:21 -08:00
  • 2c3e05746e
    Merge d040d9c6ab into 281022a80c James Mason 2018-02-23 17:42:53 +00:00
  • d040d9c6ab
    Linter fixes (many unrelated) James Mason 2018-02-23 00:41:19 -08:00
  • c300a2018f Update INSTALL.md with Ruby version requirement Stella Rouzi 2018-02-23 13:34:12 +02:00
  • 281022a80c add .pdf file extension for ticket download Jason Taylor 2018-01-16 15:22:15 +13:00
  • d40229a054
    Implement caching on admin event view James Mason 2018-02-23 00:06:10 -08:00
  • 4bd961f703
    Move events index datatable row to a partial James Mason 2018-02-23 00:00:25 -08:00
  • 128bb427c6
    Tidying up. James Mason 2018-02-22 21:23:41 -08:00
  • 6e10357631
    DRY up event export menus James Mason 2018-02-22 21:15:27 -08:00
  • 0c8095493a Skylight instrumentation Godfrey Chan 2018-02-08 22:29:58 -08:00
  • 70d2280127
    Add helper for event switch checkboxes James Mason 2018-02-13 18:12:30 -08:00
  • 48579882a5
    Use helpers for repeated event dropdown links James Mason 2018-02-13 16:33:11 -08:00
  • 25df48f351
    Remove blind_voting overreach James Mason 2018-02-13 10:38:30 -08:00
  • 23d145d667
    Clean up rating partials James Mason 2018-02-09 17:19:33 -08:00
  • 6922fd6b1d
    Merge branch 'master' into skylight-instrumentation James Mason 2018-02-22 20:13:15 -08:00
  • 637f6ce765 Add tests for conference withdrawn events Carlos Coelho 2018-02-18 16:18:13 -03:00
  • 8457dafbf6 Add withdrawn events to conference dashboard Carlos Coelho 2018-02-18 16:17:29 -03:00
  • 5f7029d28e Make calculate_event_distribution use state to group events Carlos Coelho 2018-02-18 16:16:40 -03:00
  • 9c322d682f fixed csv export bug ViditChitkara 2018-01-04 18:45:39 +05:30
  • 5ad0e2bfbd Add tests for conference withdrawn events Carlos Coelho 2018-02-18 16:18:13 -03:00
  • 266e1e087f Add withdrawn events to conference dashboard Carlos Coelho 2018-02-18 16:17:29 -03:00
  • 18b478a619 Make calculate_event_distribution use state to group events Carlos Coelho 2018-02-18 16:16:40 -03:00
  • f9060f4fb1
    Merge d8ce1ac967 into d8f3933dc0 Marie-Élise 2018-02-16 12:24:08 +00:00
  • d8f3933dc0 Update Nokogiri James Mason 2018-02-13 09:30:16 -08:00
  • 0cb5d2c1bd Add error msg for null file while Adding Commercial for event AnkushMalik 2018-01-12 17:41:20 +05:30
  • 70433c3419
    Merge branch 'master' into update-nokogiri James Mason 2018-02-13 10:02:55 -08:00
  • 09fbf51e2e
    Update Nokogiri James Mason 2018-02-13 09:30:16 -08:00
  • 4dc09a678b
    Merge branch 'master' into skylight-instrumentation James Mason 2018-02-13 08:56:22 -08:00
  • 7326bd132f Ability of user to create registration is fixed Closes #1628 namangupta01 2017-08-08 05:19:02 +05:30
  • a7cad83f7b Skylight instrumentation Godfrey Chan 2018-02-08 22:29:58 -08:00
  • 0611902610 Fix NoMethodError in revision history rahul2240 2018-01-07 21:19:21 +05:30
  • 63515cef58 Change Conference#show to load sponsors James Mason 2018-01-17 17:03:23 -08:00
  • 7d1676ff71
    Merge branch 'master' into fix-sponsor-caching James Mason 2018-02-05 09:55:42 -08:00
  • 82d8629e43 Fix social media section of splashpage James Mason 2018-01-17 12:27:22 -08:00
  • a5c80ad6e5
    Merge branch 'master' into fix-sponsor-caching James Mason 2018-01-31 09:56:44 -08:00
  • b5bcc28fa2
    Merge branch 'master' into fix-social-media-splashpage James Mason 2018-01-31 09:56:32 -08:00
  • ed21986cf1 Fix oauth btn alignment AnkushMalik 2018-01-25 09:09:18 +05:30
  • fe14e92d12 currency of a single ticket could be updated now ViditChitkara 2017-12-22 23:05:13 +05:30
  • 2fb939e32a Ability of user to create registration is fixed Closes #1628 namangupta01 2017-08-08 05:19:02 +05:30
  • 7bbe12742a Fix oauth btn alignment AnkushMalik 2018-01-25 09:09:18 +05:30
  • 66a2777677 changes for test faliures ViditChitkara 2018-01-02 19:29:28 +05:30
  • 6d67e9c959 minor changes ViditChitkara 2017-12-23 18:41:10 +05:30
  • 0ec937e43e fixed failing tests ViditChitkara 2017-12-23 18:34:26 +05:30
  • 86cab52f52 fixed ticket turnover bug ViditChitkara 2017-12-23 17:06:54 +05:30
  • cf4271a5d2
    Merge branch 'master' into ticket-turnover-bug James Mason 2018-01-23 17:55:22 -08:00
  • 2bab4ef96c
    Merge branch 'master' into fix-sponsor-caching James Mason 2018-01-18 12:32:16 -08:00
  • 2466653ed0 Merge branch 'lodging-link' of https://github.com/Harry30897/osem into lodging-link Harry30897 2018-01-19 00:10:01 +05:30
  • 0a5d294a90 Lodging link added Harry30897 2018-01-19 00:08:50 +05:30
  • 5d816f934a Corrected formatting errors. Marie-Elise 2018-01-16 19:38:22 -06:00
  • afff7e1c66 Refactored condition to check if splashpage is present. Marie-Elise 2018-01-15 22:23:38 -06:00
  • 34af9b840b Added condition to check for existing splashpage. Will redirect user if splashpage is not found. Marie-Elise 2018-01-13 22:40:42 -06:00