Commit graph

  • 754464685f refactored DomainConstraint and conference_controller_spec use params id instead of OSEM_HOSTNAME to load conference shlok007 2017-08-02 20:16:50 +05:30
  • 5086cef90b controller tests for custom domain shlok007 2017-07-26 09:04:07 +05:30
  • 31e8788eb8 fix access denied error for program in custom domains shlok007 2017-07-25 07:42:50 +05:30
  • 74fdb1bdda route to conference#show for custom domain shlok007 2017-07-22 12:34:48 +05:30
  • 33c5ab9938 Included tests for ConferenceDomainsService shlok007 2017-08-20 15:32:07 +05:30
  • e652880dd1 Merge branch 'master' into org-name-in-conf Shlok Srivastava 2017-08-19 08:34:17 +00:00
  • bc17f210a6 suggested changes that includes: moving actions for custom domain in its own controller use separate service class for custom domains updated help text for custom domains increased test coverage for custom domains shlok007 2017-08-19 13:57:09 +05:30
  • 52cde784fa Add :accept booth to ability nasia 2017-08-15 18:02:51 +03:00
  • e73218b5ca Add booth limit nasia 2017-07-28 21:46:48 +03:00
  • 06f4a6ffec Mention organization name while creating a conference shlok007 2017-08-13 02:31:46 +05:30
  • 189ba03cab Add :accept booth to ability nasia 2017-08-15 18:02:51 +03:00
  • b59cb88540 Add booth limit nasia 2017-07-28 21:46:48 +03:00
  • 703813248d Request a booth only when cfp is open nasia 2017-08-16 11:42:57 +03:00
  • 8b5ebb3dd7 Add confirmed booths to splashpage nasia 2017-07-27 11:22:14 +03:00
  • ee5a95c85d Request a booth only when cfp is open nasia 2017-08-16 11:42:57 +03:00
  • 3f324d4e6f Merge pull request #1613 from siddhantbajaj/read-qr Ana María Martínez Gómez 2017-08-16 10:05:06 +02:00
  • f4b2115ed7 Add confirmed booths to splashpage nasia 2017-07-27 11:22:14 +03:00
  • 8ff0050f24 Made lodging cards of same height w.r.t. to its row. Fixes #1456. divyanshumehta 2017-05-10 16:24:20 +05:30
  • 1391668c0f Add routes and controller to scan Qr code siddhantbajaj 2017-07-18 02:57:46 +05:30
  • 7107f9a35f Add emails for booth's acceptance and rejection nasia 2017-08-02 20:10:47 +03:00
  • 4c95958a1d Add emails for booth's acceptance and rejection nasia 2017-08-02 20:10:47 +03:00
  • 5f9c0065c6 FIX : links damien clochard 2017-08-12 10:45:12 +02:00
  • 6e191d11cc FIX : links damien clochard 2017-08-12 10:45:12 +02:00
  • b4be83e3a6 Removed delete action from abiltiy.rb and other places divyanshumehta 2017-08-09 13:26:38 +05:30
  • b717018b31 Track related fixes AEtherC0r3 2017-08-08 12:41:37 +03:00
  • 5f1ed7ce85 Handle Tracks as resource_type in User#get_roles AEtherC0r3 2017-07-28 02:05:08 +03:00
  • 2ff4c6d6b2 Add relevance field for track requests AEtherC0r3 2017-07-26 14:54:10 +03:00
  • 3d250ecf75 UI/UX changes related to tracks AEtherC0r3 2017-07-19 18:28:57 +03:00
  • f9903eba16 Change Cfp scopes to class methods AEtherC0r3 2017-07-16 20:29:03 +03:00
  • d9faffc96a Implement track request acceptance AEtherC0r3 2017-07-14 15:57:34 +03:00
  • 2f9eb04219 Enable track requests AEtherC0r3 2017-07-12 16:35:09 +03:00
  • 0f154d07c9 Mark track state as not null and add default value AEtherC0r3 2017-07-15 19:55:45 +03:00
  • fd93b04f16 Add room and dates to tracks AEtherC0r3 2017-07-12 15:56:07 +03:00
  • d616c66745 Define the track's finite state machine AEtherC0r3 2017-07-12 14:31:22 +03:00
  • 4a29252f2c Track related fixes AEtherC0r3 2017-08-08 12:41:37 +03:00
  • 3756eed9ca Handle Tracks as resource_type in User#get_roles AEtherC0r3 2017-07-28 02:05:08 +03:00
  • cdd7f614f5 Add relevance field for track requests AEtherC0r3 2017-07-26 14:54:10 +03:00
  • c2fa84392c UI/UX changes related to tracks AEtherC0r3 2017-07-19 18:28:57 +03:00
  • a1182ddd08 Change Cfp scopes to class methods AEtherC0r3 2017-07-16 20:29:03 +03:00
  • 4d6ec296c1 Implement track request acceptance AEtherC0r3 2017-07-14 15:57:34 +03:00
  • 7566b9c1ac Enable track requests AEtherC0r3 2017-07-12 16:35:09 +03:00
  • 76908ff898 Mark track state as not null and add default value AEtherC0r3 2017-07-15 19:55:45 +03:00
  • 5774d09d2b Add room and dates to tracks AEtherC0r3 2017-07-12 15:56:07 +03:00
  • 06ecc872ea Define the track's finite state machine AEtherC0r3 2017-07-12 14:31:22 +03:00
  • 678d0ae90e Merge branch 'master' into issue_1608 Stella Rouzi 2017-08-11 12:06:27 +03:00
  • 0ef6aa0644 Merge 4c60baf7c1 into 33aee342b4 Chaitanya Yadav 2017-08-11 09:03:25 +00:00
  • 33aee342b4 Add new envs to dotenv.example. Wexpo Lyu 2017-08-02 21:19:13 -05:00
  • 88e31ad902 Expose enable_starttls_auto & openssl_verify_mode. Wexpo Lyu 2017-08-02 11:24:37 -05:00
  • bd62df14c3 Fix vagrant broken after updating to Ruby 2.4 Ana María Martínez Gómez 2017-07-20 14:37:22 +02:00
  • 6efcd04de1 Merge pull request #1627 from siddhantbajaj/registration-ticket Ana María Martínez Gómez 2017-08-11 10:02:28 +02:00
  • f31651ad9c Added registration-ticket siddhantbajaj 2017-08-07 15:10:06 +05:30
  • 304339f9fc Merge d2b5ec1770 into 83abc9f71f Shlok Srivastava 2017-08-10 06:09:24 +00:00
  • 83abc9f71f remove Organization suffix from navbar-brand in navigation shlok007 2017-08-09 23:34:58 +05:30
  • 28b55a9d72 remove OSEM_NAME from navigation shlok007 2017-08-02 15:00:08 +05:30
  • 17eacaec0d add tests for organization name in conference views remove tests for organization name in conference#edit shlok007 2017-07-25 08:16:44 +05:30
  • cdc08052b1 display organization name in menu bar shlok007 2017-07-24 13:46:09 +05:30
  • 540c982771 mention organization in dashboard, splashpage and admin/conference#edit shlok007 2017-07-13 04:02:13 +05:30
  • 8d7228730c Merge branch 'master' into add-org-name Shlok Srivastava 2017-08-10 10:31:50 +05:30
  • d0a329f323 remove Organization suffix from navbar-brand in navigation shlok007 2017-08-09 23:34:58 +05:30
  • 3409d246a8 Removed delete action from abiltiy.rb and other places divyanshumehta 2017-08-09 13:26:38 +05:30
  • dfdb6f3a25 Merge branch 'master' into patch-1 Stella Rouzi 2017-08-09 11:37:09 +03:00
  • d2b5ec1770 fix Hakiri security issue https://hakiri.io/github/openSUSE/osem/master/b1624a681298ee085f4d12a4aa16081dbb7545ed shlok007 2017-08-08 22:56:42 +05:30
  • b1624a6812 introduced ability to auto detect CNAME of custom domain shlok007 2017-08-08 22:47:04 +05:30
  • 2d107c7bf5
    Add new envs to dotenv.example. Wexpo Lyu 2017-08-02 21:19:13 -05:00
  • c9984c16db
    Expose enable_starttls_auto & openssl_verify_mode. Wexpo Lyu 2017-08-02 11:24:37 -05:00
  • 32c5af2a17 Add booths to non admin nasia 2017-07-20 14:20:46 +03:00
  • 242a980619 Add booths to non admin nasia 2017-07-20 14:20:46 +03:00
  • 4c60baf7c1 Add increment and decrement functionality to left resource Chaitanya 2017-04-05 01:36:22 +05:30
  • 033dbe4c40 Fix the dropdown to get enough bottom padding. Wexpo Lyu 2017-08-04 01:01:36 -05:00
  • 9b7562fe2e Update autoprefixer-rails to 7.1.1 AEtherC0r3 2017-06-04 19:50:48 +03:00
  • cb8010bafe Update omniauth-oauth2 to 1.4.0 AEtherC0r3 2017-05-24 22:03:39 +03:00
  • 2824336ead Update sprockets to 3.7.1 AEtherC0r3 2017-05-24 21:49:53 +03:00
  • 2799653124 Update omniauth to 1.6.1 AEtherC0r3 2017-05-24 21:05:24 +03:00
  • 4e1d45382c Update awesome_nested_set to 3.1.3 AEtherC0r3 2017-05-24 20:35:38 +03:00
  • 57f450e857 Update delayed_job_active_record to 4.1.2 AEtherC0r3 2017-05-24 20:26:50 +03:00
  • 7e2bb8043f Update coffee-rails to 4.2.2 AEtherC0r3 2017-05-24 19:49:48 +03:00
  • d9649a4446 Update jquery-rails to 4.3.1 AEtherC0r3 2017-05-24 19:36:42 +03:00
  • f74f2d3f52 Update responders to 2.4.0 AEtherC0r3 2017-05-24 18:53:16 +03:00
  • d94fdb2a28 Update dotenv-rails to 2.2.1 AEtherC0r3 2017-07-18 10:16:32 +03:00
  • da8b72343b Update font-awesome-rails to 4.7.0.2 AEtherC0r3 2017-07-18 10:15:53 +03:00
  • a4b82bc830 Update sass-rails to 5.0.6 AEtherC0r3 2017-05-24 18:43:40 +03:00
  • 8fc1aa3d19 Merge branch 'master' into rails5_gem_update Stella Rouzi 2017-08-06 02:32:09 +03:00
  • a612c2e5ea added ability to attach a custom domain shlok007 2017-08-05 01:53:59 +05:30
  • 3c6594cee9 Merge pull request #1623 from laosb/patch-4 Ana María Martínez Gómez 2017-08-04 15:55:57 +02:00
  • 50c66e2e02 Explicitly add .pdf to make it a PDF file. Wexpo Lyu 2017-08-04 04:01:42 -05:00
  • 6501d0df29 Fix the dropdown to get enough bottom padding. Wexpo Lyu 2017-08-04 01:01:36 -05:00
  • 52cdb41618 added feature test and permissions for custom_domain shlok007 2017-08-03 11:15:19 +05:30
  • 364adffdab added show page for custom domain shlok007 2017-08-03 00:07:38 +05:30
  • ec435b6503 refactored DomainConstraint and conference_controller_spec use params id instead of OSEM_HOSTNAME to load conference shlok007 2017-08-02 20:16:50 +05:30
  • 152162533e remove OSEM_NAME from navigation shlok007 2017-08-02 15:00:08 +05:30
  • 8c967a9f6b Merge 72c4e9f24c into 80a9544279 Rahul 2017-08-01 08:30:31 +00:00
  • 6b064a58a0 Merge 07ad46a8f7 into 80a9544279 nasia-sam 2017-08-01 08:30:30 +00:00
  • 80a9544279 move admin/users to be accessed only by site admins shlok007 2017-07-14 21:09:28 +05:30
  • 6b55a28813 Merge branch 'master' into moving-users Shlok Srivastava 2017-08-01 13:20:51 +05:30
  • 07ad46a8f7 Add emails for accepted and rejected booths nasia 2017-07-31 21:44:19 +03:00
  • 72c4e9f24c add valid email regex in user.rb rahul 2017-07-26 22:31:54 +05:30
  • e6f6a00d43 controller tests for custom domain shlok007 2017-07-26 09:04:07 +05:30
  • 19d4abb0c1 fix access denied error for program in custom domains shlok007 2017-07-25 07:42:50 +05:30
  • 3e7d6e4b04 route to conference#show for custom domain shlok007 2017-07-22 12:34:48 +05:30
  • edd0024a17 Merge pull request #1600 from siddhantbajaj/pdf-attachment Ana María Martínez Gómez 2017-07-26 09:39:11 +02:00