Commit graph

  • bafeca7ab9
    [fix]Remove duplicate code Jimmy 2021-04-22 01:24:14 +08:00
  • 83e4601ddb
    [fix]Add nil check for happening_now partial Jimmy 2021-04-22 01:13:56 +08:00
  • 74437ab1e5
    [fix]Remove unnecessary check in happening_now partial Jimmy 2021-04-22 00:59:38 +08:00
  • 83e7321b69
    [style]Fix rubocop Jimmy 2021-04-22 00:43:27 +08:00
  • c4920ba85d
    [fix]Fix ajax for pagination Jimmy 2021-04-22 00:40:53 +08:00
  • d564de7caa show happening now and happening next on the events page rajavi-mishra 2021-04-21 09:01:12 -07:00
  • 014613248e
    Merge pull request #70 from CactusPuppy/177555226-happening-next kingdish 2021-04-21 08:24:49 +08:00
  • ad5a6c264a
    [style]Fix style Jimmy 2021-04-20 13:52:44 +08:00
  • e4df68f2d8
    [fix]Store current time to a variable to make sure timestamps are the same Jimmy 2021-04-20 13:48:47 +08:00
  • 2280d1f7b6
    [fix]Change wording when no events is happening now or next Jimmy 2021-04-20 13:21:19 +08:00
  • 24d2fa89a8
    [style]Remove unused code Jimmy 2021-04-19 19:23:41 +08:00
  • 47f183fc89
    [style]Fix duplicate code in conference_helper Jimmy 2021-04-19 19:01:31 +08:00
  • 5de9f97ea8
    [fix]Remove print Jimmy 2021-04-19 18:54:01 +08:00
  • 54e051be90
    [fix]Use full_splashpage instead of splashpage Jimmy 2021-04-19 18:47:21 +08:00
  • 9af06715e1
    [temp]Print page.html Jimmy 2021-04-19 18:37:04 +08:00
  • bb665c934f
    [test]Use scenario instead of it Jimmy 2021-04-19 18:35:26 +08:00
  • d3ed87211a
    [temp]Try feature:true Jimmy 2021-04-19 18:26:54 +08:00
  • c7490dfe77
    [fix]Fix splashpage spec Jimmy 2021-04-19 17:50:01 +08:00
  • 4e68989955
    [test]Add integration tests for the happening now section on the splashpage Jimmy 2021-04-19 14:24:54 +08:00
  • 1fd1d395d5
    [test]Add test for ConferenceHelper#get_happening_next_events_schedules Jimmy 2021-04-19 13:33:00 +08:00
  • b32f2416da
    [test]Add test for SchedulersController#happening_later? Jimmy 2021-04-19 13:23:49 +08:00
  • 3fc157ebc1
    Merge pull request #127 from snap-cloud/depfu/update/rolify-5.3.0 Michael Ball 2021-04-17 17:50:52 -07:00
  • 0d8a06184b
    Merge pull request #129 from snap-cloud/submission-reviewer-comments Michael Ball 2021-04-17 17:46:21 -07:00
  • b099246f78 delinting...space.... Michael Ball 2021-04-17 17:45:55 -07:00
  • 59f534a010 fix hash style Michael Ball 2021-04-17 17:33:59 -07:00
  • f012201d3c Merge branch 'master' of git://github.com/CactusPuppy/snapcon into submission-reviewer-comments Michael Ball 2021-04-17 17:30:06 -07:00
  • 4c056f208e Delinting Michael Ball 2021-04-17 17:29:58 -07:00
  • 5a3012f0b7 Add comiittee_review(_html) options to email spec Michael Ball 2021-04-17 17:08:16 -07:00
  • ab15a3fb10
    [refractor]Use ? methods instead of boolean variables; rename happening_next? to happening_later? Jimmy 2021-04-17 08:30:07 +08:00
  • e1c10d16b0
    Merge pull request #71 from CactusPuppy/fix-github-actions CactusPuppy 2021-04-16 10:04:57 -07:00
  • 9774779fbc
    Attempt to use stable release of codacy reporter CactusPuppy 2021-04-16 09:47:42 -07:00
  • 59c5d432ed
    [style]Remove extra white space Jimmy 2021-04-17 00:22:17 +08:00
  • 2f8cee3c4f
    [feat]Splashpage will display happening next event if no event is happening now Jimmy 2021-04-17 00:00:52 +08:00
  • 19af4e4f12
    [fix]Fix rake data:test by including webmock Jimmy 2021-04-16 23:08:44 +08:00
  • 927e8ec436 merge master Michael Ball 2021-04-16 01:23:39 -07:00
  • a88402642c What the heck! Add a short URL for conferences Michael Ball 2021-04-16 01:15:22 -07:00
  • f6c7a50bba Add {committee_review} to emails and support HTML Michael Ball 2021-04-16 01:08:28 -07:00
  • 9786843eac Display Committee Review on #show and #edit. Michael Ball 2021-04-16 00:33:47 -07:00
  • 0e74c2e296 Minor tidying up Michael Ball 2021-04-15 22:31:46 -07:00
  • 6ce36c0fca Merge branch 'master' into submission-reviewer-comments Michael Ball 2021-04-15 22:22:52 -07:00
  • 4dedfdfe90 Merge branch 'master' of github.com:snap-cloud/snapcon Michael Ball 2021-04-15 22:22:23 -07:00
  • 68004c842e
    Merge pull request #138 from snap-cloud/confirmation-email-update Michael Ball 2021-04-15 22:18:23 -07:00
  • d4ffda5d58 merge master Michael Ball 2021-04-15 21:56:18 -07:00
  • c0a086862a Skip datatable spec because github actions is weird. Michael Ball 2021-04-15 20:32:21 -07:00
  • 15e910a323
    Merge pull request #137 from CactusPuppy/master Michael Ball 2021-04-15 20:30:01 -07:00
  • eaf13b1b69
    Merge branch 'master' into master Michael Ball 2021-04-15 20:29:54 -07:00
  • 5fe94c99af
    Merge pull request #133 from snap-cloud/rails-updates-enhanced-template Michael Ball 2021-04-15 20:17:15 -07:00
  • c1ebe95565 Add devise view files for email messages Michael Ball 2021-04-15 20:11:56 -07:00
  • 9f83965c18 Make the _mailbot_* files not depend on @conference Michael Ball 2021-04-15 20:11:40 -07:00
  • d4dba945fc Tweak devise text for confirm emails Michael Ball 2021-04-15 19:10:21 -07:00
  • f0fc704c13
    Update omniauth to version 2.0.4 depfu[bot] 2021-04-14 20:52:11 +00:00
  • 7e13705ffe
    Update nokogiri to version 1.11.3 depfu[bot] 2021-04-14 20:46:51 +00:00
  • 3c2a0826c9
    Merge pull request #2746 from differentreality/letter_opener_web Stella Rouzi 2021-04-14 11:21:39 +03:00
  • f97d4ca0f1 Add letter opener web Stella Rouzi 2021-04-11 13:53:41 +03:00
  • bf945c4b5a
    Merge pull request #69 from CactusPuppy/migrate-on-deploy CactusPuppy 2021-04-13 16:30:08 -07:00
  • ad03f50200
    Run database migrations on release CactusPuppy 2021-04-13 15:45:51 -07:00
  • e26181e1ec
    Merge pull request #65 from CactusPuppy/177717903-move-constants-to-configuration-file kingdish 2021-04-14 06:36:23 +08:00
  • e2c30d22d7
    Merge pull request #68 from CactusPuppy/pull-upstream CactusPuppy 2021-04-13 12:03:32 -07:00
  • 90d513ba0c
    Merge branch 'master' into pull-upstream CactusPuppy 2021-04-13 11:47:38 -07:00
  • 0eb0ae9547
    [fix]Add mailbot.css to assets.rb Jimmy 2021-04-13 13:51:18 +08:00
  • 8ff3958685
    [fix]Fix empty string check Jimmy 2021-04-13 11:47:13 +08:00
  • 83ecd98997
    [fix]Fix program#any_event_for_this_date? Jimmy 2021-04-13 11:41:13 +08:00
  • 4f68051b9e
    Add newline at end of show.js.erb file CactusPuppy 2021-04-11 13:46:56 -07:00
  • fec78dccce
    [feat]Display happening now only if program is also displayed Jimmy 2021-04-10 00:44:42 +08:00
  • 497818cc45
    [feat]Add brief version of event partial; fix style Jimmy 2021-04-09 22:17:33 +08:00
  • 7ae94589fa
    [feat]Description / happening now takes the entire row if the other is empty Jimmy 2021-04-09 22:01:57 +08:00
  • 0c73d24f05
    [feat]Use Ajax for paginating happening_now Jimmy 2021-04-09 17:16:16 +08:00
  • 46094306af
    [style]Fix style Jimmy 2021-04-09 16:51:04 +08:00
  • 3ebcefded1
    [refactor]Delete unused javascript; Move about-and-happening-now to partial Jimmy 2021-04-09 16:41:16 +08:00
  • a649505104
    [feat]Add bootstrap style to pagination navbar Jimmy 2021-04-09 16:33:39 +08:00
  • 385bc72973
    [fix]Fix style; Re-enable checking happening now Jimmy 2021-04-08 12:52:13 +08:00
  • 779ed123e7
    items per page madhekare 2021-04-07 21:26:31 -07:00
  • 80d94337a2
    pagination madhekare 2021-04-07 21:07:24 -07:00
  • 847357dae7
    pagination happening now madhekare 2021-04-07 20:56:03 -07:00
  • 7f133928b6
    [fix]Fix trapezoid on splashpage Jimmy 2021-04-07 22:50:27 +08:00
  • 011f7ecab5
    [feat]Add md lg view for happening_now column Jimmy 2021-04-07 18:55:34 +08:00
  • f320f3202a
    [feat]Display description and happening now in two columns; display happening now first in sm view Jimmy 2021-04-07 17:55:20 +08:00
  • 26ddb198a1
    [style]Fix style Jimmy 2021-04-07 11:13:41 +08:00
  • 9d890d637e
    [feat]Add a title for happening now section in splashpage Jimmy 2021-04-07 11:06:48 +08:00
  • 71d926b4a0
    [feat]Center happening now events on the splashpage Jimmy 2021-04-07 11:00:03 +08:00
  • 3b96d9e63e
    [feat] Display happening now events in splashpage Jimmy 2021-04-07 10:34:49 +08:00
  • a7a6255656
    [style] Fix name of method Jimmy 2021-04-06 13:27:05 +08:00
  • 2ea27b21da
    [feat]Move happening_now to ConferenceHelper Jimmy 2021-04-06 13:16:59 +08:00
  • 322a5b40bc
    [temp] Add no events happening now in splashpage Jimmy 2021-04-05 20:45:40 +08:00
  • f260139b2d
    [temp]Ajax request of happening now JSON in progress Jimmy 2021-04-05 15:07:18 +08:00
  • ca2e053fc4
    [temp] Add happening_now placeholder in splashpage Jimmy 2021-04-01 13:30:44 +08:00
  • 6fd3c88f76
    [feat]Add include_happening_now checkbox to the admin splashpage Jimmy 2021-04-01 13:14:31 +08:00
  • fd8652d768
    [feat] Add include_happening_now field to splashpages table Jimmy 2021-04-01 13:08:09 +08:00
  • 1e88ff6ad7
    Fix Rubocop complaints CactusPuppy 2021-04-09 11:54:11 -07:00
  • e65108e2fb
    Fix spec that was not updated with update to delete_lead CactusPuppy 2021-04-09 11:53:54 -07:00
  • aab281e116
    Get destroy job working properly and prevent misfires on updated users CactusPuppy 2021-04-09 10:55:46 -07:00
  • eca14fba43
    Fix rubocop error with missing space after comma CactusPuppy 2021-04-09 00:45:03 -07:00
  • 42518a1323
    Fully address AR callback issues CactusPuppy 2021-04-09 00:42:14 -07:00
  • f4c0216812
    Remove name conflict change which caused PaperTrail to fail CactusPuppy 2021-04-07 22:48:57 -07:00
  • 5aa24ee261
    Add spec for query_api method CactusPuppy 2021-04-01 23:20:21 -07:00
  • a6e76e3c90
    Make body argument for query_api more clear CactusPuppy 2021-04-01 23:10:43 -07:00
  • 563d283e5b
    Remove redundant comments CactusPuppy 2021-04-01 23:00:17 -07:00
  • d59c5e9c1d
    Actually properly track saved changes within the User model CactusPuppy 2021-04-01 22:59:53 -07:00
  • f41d0625b4
    Rubocop linting issues fixed CactusPuppy 2021-04-01 22:08:25 -07:00
  • c00180019b
    Try fixing query_api 0 argument error Ziyi 2021-04-01 22:01:09 -07:00