Commit graph

  • ddc3780fa0
    Merge branch 'master' into rails5_upgrade James Mason 2017-12-11 08:32:00 -08:00
  • 23ffc980c7 optional abstract Naman Gupta 2017-12-11 21:44:00 +05:30
  • b4fcec07be
    Merge pull request #1874 from adrianovieira/fix_1856_Description_of_the_CFP_should_not_be_rendered_as_markdown Ana María Martínez Gómez 2017-12-11 08:51:30 +01:00
  • dc5408541d Fixed email text overflow in proposal#show rishabhptr 2017-12-05 17:03:44 +05:30
  • 4859f8c64e Render CfP description column as plain text Adriano Vieira 2017-12-09 17:36:33 -02:00
  • 16d27053ee autofill CFP end date Adriano Vieira 2017-12-09 12:00:50 -02:00
  • ea23d05d34 Change email text by an icon in proposal page Adriano Vieira 2017-12-09 10:49:49 -02:00
  • 67a0df62d6
    Fix example file to work with docker mailhog Vincent Misson 2017-12-09 01:00:16 +01:00
  • 31ff5c434d
    Reviewed changes Ismael Olea 2017-12-08 19:54:56 +01:00
  • d0327bb987
    Merge branch 'master' into autofocus_tickets James Mason 2017-12-08 09:51:21 -08:00
  • 4df6be16c7
    Merge branch 'master' into rails5_upgrade James Mason 2017-12-08 09:22:01 -08:00
  • 73fdcaf4c9 If there are only one conference in the future and it has a public splashpage, redirect to it in conferences#index. Change tests root_path to conference_path(conference). David Sedeño 2017-12-06 23:45:52 +01:00
  • d7e81d9859 Contribution.md broken url Sidharth 2017-12-08 15:03:30 +05:30
  • 0cb273749a
    Merge pull request #1845 from adrianovieira/autofill_conference_end_date Ana María Martínez Gómez 2017-12-08 08:58:53 +01:00
  • ad2a971ef2 Change visit_id type of ahoy_events to integer AEtherC0r3 2017-11-18 13:41:11 +02:00
  • eaccdf2373 Use environment variable for the redis url in cable.yml AEtherC0r3 2017-11-09 17:43:41 +02:00
  • 71154e5cca Performance tuning in config/puma.rb AEtherC0r3 2017-11-07 22:02:10 +02:00
  • 9a184d9e9d Upgrade to Rails 5 AEtherC0r3 2017-09-05 22:23:34 +03:00
  • 52dcc6c474 Added autofocus on the name input in admin/lodgings#new foteinidd 2017-11-30 18:59:36 +02:00
  • 7dbab48f14 Button Redirection konstantinos-zarzavatsakis 2017-12-07 20:11:34 +02:00
  • a17e367afc
    Merge branch 'master' into autofocus James Mason 2017-12-07 09:59:27 -08:00
  • d464e48085
    Merge pull request #1843 from adrianovieira/fix_datetimepicker_navigation_for_conference_startend_fields James Mason 2017-12-07 09:57:55 -08:00
  • fd24530965 Add call for booths section in conference splashpage(conferences#show) evris99 2017-12-07 19:53:52 +02:00
  • 9b32e9c165
    Merge branch 'master' into fix_datetimepicker_navigation_for_conference_startend_fields James Mason 2017-12-07 09:30:52 -08:00
  • 2196b66bb1 Merge f3358ec20b into bd95c5e628 David Sedeño 2017-12-07 17:29:13 +00:00
  • bd95c5e628
    Merge pull request #1859 from olea/issue-1830 James Mason 2017-12-07 09:29:03 -08:00
  • b83c0032d3
    Merge branch 'master' into autofill_conference_end_date James Mason 2017-12-07 09:22:56 -08:00
  • ebcc2e9ed3
    Merge branch 'master' into fix_datetimepicker_navigation_for_conference_startend_fields James Mason 2017-12-07 09:21:19 -08:00
  • aabe0f3a96
    Merge branch 'master' into autofocus James Mason 2017-12-07 09:17:15 -08:00
  • f3358ec20b Fix incorrect use in if David Sedeño 2017-12-07 11:28:39 +01:00
  • 5364142848 If there are only one conference in the future and it has a public splashpage, redirect to it in conferences#index. fix #1259 David Sedeño 2017-12-06 23:45:52 +01:00
  • bbb09dd237 autofill conference end date Adriano Vieira 2017-12-02 18:24:30 -02:00
  • 166d1bda0d Fix the UI inconsistence documented at #1830 Ismael Olea 2017-12-05 23:30:01 +01:00
  • cbc783e6e9
    Update Dockerfile Ismael Olea 2017-12-05 15:06:03 +01:00
  • b97122097f
    Merge pull request #1852 from SidharthBansal/ui Ana María Martínez Gómez 2017-12-05 09:18:53 +01:00
  • 93fcf8893a Fix Style/UnneededInterpolation Sidharth 2017-12-04 23:45:37 +05:30
  • 7621906acc Merge 70db3c0c18 into 666f5ab2dc Sidharth Bansal 2017-12-04 15:10:59 +00:00
  • e939f25641 Merge 53e220f142 into 666f5ab2dc Adriano Vieira 2017-12-04 13:52:12 +00:00
  • 666f5ab2dc
    Merge pull request #1850 from SidharthBansal/new Ana María Martínez Gómez 2017-12-04 14:40:01 +01:00
  • b1ae00d108 Fix the docker persistence for uploaded pictures: #1833 #1667 Ismael Olea 2017-12-04 13:25:39 +01:00
  • 020dae3d49 Fix Style/ReductantReturn rubocop Sidharth 2017-12-04 13:05:23 +05:30
  • 05735a7f67
    Merge pull request #1848 from rishabh92/fix-orderedgem-offenses1816 Ana María Martínez Gómez 2017-12-04 09:55:50 +01:00
  • 51be0c3f65
    Merge pull request #1849 from esquith/patch-1 Ana María Martínez Gómez 2017-12-04 09:26:07 +01:00
  • 56afd4e22b
    Update INSTALL.md Esquith Allen 2017-12-03 22:19:01 -05:00
  • 97749fc195 Fix Bundler/OrderedGems Rubocop offenses rishabh92 2017-12-03 18:19:21 -06:00
  • 70db3c0c18
    Merge branch 'master' into master Sidharth Bansal 2017-12-04 00:21:06 +05:30
  • d5df7017d9 Fix Style/UnneededInterpolation Sidharth 2017-12-03 16:49:11 +05:30
  • 2e1fae0afb Fix datetimepicker navigation for manual clean up of conference start/end date fields (fix #1842) Adriano Vieira 2017-12-02 17:18:37 -02:00
  • 775b48327c Add autofocus in admin/tickets#new Thaleia Tagaraki 2017-12-02 16:23:56 +02:00
  • 53e220f142
    Merge branch 'master' into update_dbseed_organization Adriano Vieira 2017-11-30 21:58:54 -02:00
  • fe8483b92e Fix user to run rake task for dbsetup Adriano Vieira 2017-11-30 17:23:51 -02:00
  • 92f27561df Update current directory for centos box Adriano Vieira 2017-11-30 15:55:36 -02:00
  • 0b0b9fa415 Added autofocus on the name input in admin/lodgings#new foteinidd 2017-11-30 18:59:36 +02:00
  • c0e4d54415
    Merge pull request #1826 from olea/master Ana María Martínez Gómez 2017-11-30 09:58:23 +01:00
  • da735fe1c9 Yes: it's a trivial change in just an example. But not trivial for non rubyists Ismael Olea 2017-11-29 19:35:54 +01:00
  • 2be553c547
    Merge pull request #1817 from rahul2240/rubocop Ana María Martínez Gómez 2017-11-29 09:20:47 +01:00
  • 3024bddb82 Merge 7ea100d2ec into 8442eb813f James Mason 2017-11-29 01:31:44 +00:00
  • 7ea100d2ec
    Let's get serious about linting, folks. James Mason 2017-11-27 20:04:54 -08:00
  • c31e2ac583
    Redesign splashpage program section & split out partials James Mason 2017-11-27 18:26:34 -08:00
  • eb6980c31b
    Offset venue map to center up marker James Mason 2017-11-26 20:53:03 -08:00
  • 9bd8019448
    Move sponsor modal to a generic partial & redesign. James Mason 2017-11-26 20:37:02 -08:00
  • d900b88747
    Generalize get_logo helper for all classes James Mason 2017-11-26 20:34:27 -08:00
  • 947689b3ff
    Consistent design and code cleanup of splashpage elements. James Mason 2017-11-21 18:31:14 -08:00
  • 5d13499fee
    Fold call for papers & call for tracks into one splashpage section James Mason 2017-11-21 10:56:46 -08:00
  • 1ad6ad7e79
    Fold booths into the schedule section of splashpage James Mason 2017-11-21 10:26:19 -08:00
  • 9b462d4d34 Reorder splashpage sections James Mason 2017-11-21 10:14:54 -08:00
  • e40cdeb94b
    Update init.sh Jesús 2017-11-28 17:27:42 +01:00
  • 2affec9614 Regenerate rubocop_todo file rahul2240 2017-11-27 22:44:37 +05:30
  • 9cf3f63bae Update rubocop to 0.51.0 rahul2240 2017-11-27 22:37:53 +05:30
  • 166b94a3b2
    Redesign & move splashpage header into a partial James Mason 2017-11-21 10:06:58 -08:00
  • 82a89b7319
    Use fragment caching on the splashpage James Mason 2017-11-21 09:54:27 -08:00
  • b074cbfc95
    Configure cache stores James Mason 2017-11-17 18:32:08 -08:00
  • fd64be878c
    Logic for showing splashpage is not the views' concern James Mason 2017-11-20 19:46:12 -08:00
  • a31f8f4db0
    Fewer queries for for Conference#show James Mason 2017-11-17 19:34:26 -08:00
  • 4f5b530850
    Remove overlap in breakpoints James Mason 2017-10-24 19:58:03 -07:00
  • cf3aeda1d2
    Fixing admin user creation in docker Jesús 2017-11-24 21:41:08 +01:00
  • 8442eb813f
    Merge pull request #1807 from ViditChitkara/ticket_turnover James Mason 2017-11-21 17:31:41 -08:00
  • 38342cd557 fixed tickets turnover bug ViditChitkara 2017-11-21 13:24:47 +05:30
  • c86349020d Merge 0d7da83f3a into 22247a0ac2 Vidit 2017-11-21 07:38:44 +00:00
  • 0d7da83f3a fixed tickets turnover bug ViditChitkara 2017-11-21 13:04:59 +05:30
  • 65304fe7e7 Merge branch 'master' of https://github.com/openSUSE/osem ViditChitkara 2017-11-20 22:41:02 +05:30
  • 22247a0ac2
    Merge pull request #1792 from bear454/ssl-opt James Mason 2017-11-19 13:43:54 -08:00
  • 8af91b3500 Merge 2a285b329f into 9603cf5173 Akshit Ahluwalia 2017-11-19 18:59:58 +00:00
  • fb4bafb296
    Merge branch 'master' into ssl-opt James Mason 2017-11-17 09:45:51 -08:00
  • edb03a7e4c Merge f4a428a58d into 9603cf5173 Gabriel Silva Vinha 2017-11-17 12:25:08 +00:00
  • 9603cf5173
    Merge pull request #1802 from Ana06/yajl-vulnerability Ana María Martínez Gómez 2017-11-17 10:43:54 +01:00
  • 9885b3617f Update yajl-ruby to 1.3.1 Ana María Martínez Gómez 2017-11-17 10:07:02 +01:00
  • ae2b754079 Merge 09ecc1174f into 3239b74444 Kyriakos Zagoumidis 2017-11-17 04:08:31 +00:00
  • 3239b74444
    Merge pull request #1797 from evris99/travis_changes James Mason 2017-11-16 20:08:12 -08:00
  • 42ab3b9968
    Merge branch 'master' into travis_changes James Mason 2017-11-16 19:44:52 -08:00
  • 67d604cf40
    Merge pull request #1801 from namangupta01/test1 James Mason 2017-11-16 19:44:00 -08:00
  • ee6040ffd6
    Merge branch 'master' into ssl-opt James Mason 2017-11-16 18:13:38 -08:00
  • e32837b3b1 schema is added Naman Gupta 2017-11-17 00:41:20 +05:30
  • 09ecc1174f changed db:migrate to db:schema load Kyriakos Zag 2017-11-16 18:34:58 +02:00
  • f2d3813986 Changed db:migrate to db:schema:load evris99 2017-11-16 18:34:47 +02:00
  • d65b139099 Merge branch 'master' of https://github.com/openSUSE/osem Kyriakos Zag 2017-11-16 18:26:44 +02:00
  • aa3825e77a a commit Kyriakos Zag 2017-11-16 18:24:29 +02:00
  • 1989438e89
    Merge pull request #1777 from bear454/recaptcha James Mason 2017-11-15 12:38:40 -08:00
  • eca09dd7d6
    Merge branch 'master' into recaptcha James Mason 2017-11-15 11:58:15 -08:00
  • c3872c9bd0 added email presence validation to openid ViditChitkara 2017-10-21 02:38:41 +05:30