Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release: merge Develop to Master #137

Closed
wants to merge 82 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
cf832cf
Bump addressable from 2.7.0 to 2.8.0
dependabot[bot] Jul 12, 2021
da2801b
Bump nokogiri from 1.11.7 to 1.12.5
dependabot[bot] Sep 27, 2021
060a038
Ruby 2.6
kangkyu Jan 1, 2022
a47c3d9
Merge pull request #96 from kangkyu/dependabot/bundler/addressable-2.8.0
kangkyu Jan 1, 2022
04049db
Merge pull request #97 from kangkyu/dependabot/bundler/nokogiri-1.12.5
kangkyu Jan 1, 2022
9f08e54
Bump puma from 5.3.1 to 5.5.1
dependabot[bot] Jan 1, 2022
a9f277b
Merge pull request #98 from kangkyu/dependabot/bundler/puma-5.5.1
kangkyu Jan 1, 2022
226f758
bundle update rails - bump 5.2.6.2
webkay Feb 20, 2022
7424d9c
app:update
webkay Feb 20, 2022
f36e3f3
Fix test pass
webkay Feb 20, 2022
8513c77
Use bootstrap-ruby gem (bootstrap 4)
webkay Feb 20, 2022
2ddf6e9
Fix style for bootstrap 4 - need more styling, but later
webkay Feb 20, 2022
faa9c55
load_defaults 5.2
webkay Feb 20, 2022
dc61680
Merge pull request #101 from webkay/up_rails
kangkyu Feb 20, 2022
7088838
rails app:update for 6.0
kangkyu Feb 20, 2022
d379d4c
Remove selenium - not used
kangkyu Feb 20, 2022
4435c90
load_defaults 6.0
kangkyu Feb 20, 2022
7d5293d
Merge pull request #102 from kangkyu/up-rails
kangkyu Feb 20, 2022
80812e3
Create rubyonrails.yml
kangkyu Feb 20, 2022
f845f5f
bundle update - rails 6.1.4.6
kangkyu Feb 20, 2022
c120b15
Test pass after rails app:update
kangkyu Feb 20, 2022
d601167
load_defaults 6.1
kangkyu Feb 20, 2022
a65ee74
Github Actions needs tool-versions file
kangkyu Feb 20, 2022
0260a76
bundle exec on workflow
kangkyu Feb 20, 2022
b9a4c6c
Time.now.in_time_zone -> Time.current
kangkyu Feb 20, 2022
63ff27d
For now, just comment out the test to pass ci test
kangkyu Feb 20, 2022
d0ea171
bundle update rails - version 7.0.2.2
kangkyu Feb 20, 2022
4167f5c
rails 7.0
kangkyu Feb 20, 2022
8134c53
Merge pull request #103 from kangkyu/up-rails
kangkyu Feb 20, 2022
e406fd6
col-xs- are in Bootstrap 4 col-
kangkyu Feb 24, 2022
f51a74f
Merge pull request #105 from kangkyu/fix-grid
kangkyu Feb 24, 2022
82d0128
Uncomment start_done_at test
kangkyu Feb 24, 2022
e252d82
Fix test with all the time zone correctly
kangkyu Feb 25, 2022
dacf29d
Merge pull request #107 from kangkyu/start_done_at
kangkyu Feb 25, 2022
4775dad
Bump nokogiri from 1.13.1 to 1.13.3
dependabot[bot] Feb 26, 2022
7b959e4
Merge pull request #108 from kangkyu/dependabot/bundler/nokogiri-1.13.3
kangkyu Feb 27, 2022
15db0b1
Add turbo-rails and use turbo_frame_tag for tasks (#109)
kangkyu Feb 27, 2022
a6fccb2
HotFix: task update button
kangkyu Feb 27, 2022
6fd5eb0
Some progress bar can be from the right side
kangkyu Feb 27, 2022
2e1979c
Merge pull request #112 from kangkyu/progress_bar_reverse
kangkyu Feb 27, 2022
b01b942
HotFix dismiss button was not working (bootstrap 5)
kangkyu Feb 27, 2022
087ad5e
Rails 7.0.2.3 came out; change button text
kangkyu Mar 21, 2022
6982a71
Merge pull request #113 from kangkyu/up-rails
kangkyu Mar 21, 2022
e0d8c6e
Bump puma from 5.6.2 to 5.6.4
dependabot[bot] Mar 30, 2022
7e87329
Merge pull request #114 from kangkyu/dependabot/bundler/puma-5.6.4
kangkyu Apr 12, 2022
643e374
Bump nokogiri from 1.13.3 to 1.13.4
dependabot[bot] Apr 12, 2022
e4e14fb
Merge pull request #115 from kangkyu/dependabot/bundler/nokogiri-1.13.4
kangkyu Apr 23, 2022
4cda3ed
Bump nokogiri from 1.13.4 to 1.13.6
dependabot[bot] May 19, 2022
c0a5d87
Bump rack from 2.2.3 to 2.2.3.1
dependabot[bot] May 27, 2022
f09c752
Bump rails-html-sanitizer from 1.4.2 to 1.4.3
dependabot[bot] Jul 6, 2022
3cddb74
Merge pull request #116 from kangkyu/dependabot/bundler/nokogiri-1.13.6
webkay Jul 7, 2022
60942da
Merge pull request #117 from kangkyu/dependabot/bundler/rack-2.2.3.1
kangkyu Jul 7, 2022
07b6ced
Merge pull request #118 from kangkyu/dependabot/bundler/rails-html-sa…
kangkyu Jul 7, 2022
5d20f7c
bundle update rails with ruby 2.7.6 (sprockets became 4) (#119)
kangkyu Jul 7, 2022
874254f
label
kangkyu Jul 19, 2022
7cfa3c8
move tab_bar to the main layout; set title; update README
kangkyu Feb 27, 2022
186f297
This way looks better
kangkyu Feb 27, 2022
4f4c4ad
Rails 7.0.3.1
kangkyu Jul 19, 2022
a1e117b
Merge pull request #110 from kangkyu/cleaning
kangkyu Jul 19, 2022
cfeb75e
Merge pull request #120 from kangkyu/up-rails
kangkyu Jul 19, 2022
df43983
Bump Ruby 3.0.4
kangkyu Aug 9, 2022
f1b3e63
Update ruby on the github actions file
kangkyu Aug 9, 2022
0486834
Merge pull request #121 from kangkyu/up-rails
kangkyu Aug 9, 2022
97d84c8
Bump loofah from 2.18.0 to 2.19.1
dependabot[bot] Dec 13, 2022
350a280
Merge pull request #124 from kangkyu/dependabot/bundler/loofah-2.19.1
kangkyu Dec 16, 2022
ec630da
Ruby 3.1.3, Puma 6, bundle update
kangkyu Dec 16, 2022
337ade7
Update puma file still working with new version
kangkyu Dec 16, 2022
ce5644f
Update workflow ruby version; update cable file
kangkyu Dec 16, 2022
2eeab59
Merge pull request #126 from kangkyu/up-rails-ruby
kangkyu Dec 16, 2022
7c22931
Do not call me Tasks In Touch
kangkyu Dec 16, 2022
383a1fc
Correct prefix name
kangkyu Dec 16, 2022
4615621
Merge pull request #127 from kangkyu/frontend
kangkyu Apr 17, 2023
947d5d4
bundle update rails - upgrade outdated gems
kangkyu Apr 17, 2023
1ac183c
Merge pull request #133 from kangkyu/up-rails
kangkyu Apr 17, 2023
847dac4
bundle update with ruby 3.1.4
kangkyu Aug 15, 2023
ac86644
3.1.4 for actions
kangkyu Aug 15, 2023
52aab6c
Merge pull request #134 from kangkyu/up-rails
kangkyu Aug 15, 2023
3c085ca
Hotfix: time distance string is frozen
kangkyu Aug 15, 2023
bdedcdb
bundle update rails
kangkyu Aug 28, 2023
368d080
bundle update puma
kangkyu Aug 28, 2023
827c251
Change body font and title ongoin.gs
kangkyu Jul 9, 2024
50788db
Merge pull request #136 from kangkyu/kangkyu/noto-sans
webkay Jul 9, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Change body font and title ongoin.gs
kangkyu committed Jul 9, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 827c251ccb4b71d8e6f54971e866eed956900f23
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Sessions To Do
## session-do

> You have said "I'll do it every now and then" on your tasks. But do you remember when? You might ask "When was the last time I've done it" for each task (or "session"). You might say "I have done this a while ago", but how long ago?
2 changes: 1 addition & 1 deletion app/assets/stylesheets/application.sass
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
@import font-awesome

@import custom
@import url("//fonts.googleapis.com/css?family=Open+Sans:400,700,300")
@import url("//fonts.googleapis.com/css?family=Noto+Sans:400,700,300")

@import "bootstrap-datepicker3"
@import tasks
2 changes: 1 addition & 1 deletion app/assets/stylesheets/custom.sass
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ $default-border: #333333
@extend .has-error !optional

body
font-family: 'Open Sans', Helvetica, Arial, sans-serif
font-family: 'Noto Sans', sans-serif

.btn.btn-default
border-color: $default-border
2 changes: 1 addition & 1 deletion app/views/layouts/_page_bottom.html.haml
Original file line number Diff line number Diff line change
@@ -5,4 +5,4 @@
.nav-item
= button_to "Log Out", session_path, method: :delete, class: 'btn'
%hr
Sessions To Do © 2022
Ongoing Tasks © 2022
2 changes: 1 addition & 1 deletion app/views/layouts/application.html.haml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
!!!
%html
%head
%title Sessions To Do
%title ongoin.gs

%meta{name:"viewport", content:"width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"}
= favicon_link_tag '/favicon.ico'