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.

Sign up for GitHub

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

Jump to bottom

Develop #54

Open
wants to merge 138 commits into
base: master
Choose a base branch
from
Open

Develop #54

wants to merge 138 commits into from

Conversation

huwenxin
Copy link
Contributor

No description provided.

Airop and others added 30 commits April 5, 2020 12:31
add Navdrawer.vue
1e109c5
rename Navdrawer.vue to NavDrawer.vue
bab83d7 
adjust height in THBImage.vue
fix Toolbar.vue
extend store.js
add progress circular
fix endpoint link
8064863
add Navdrawer.vue
077da5a
@Airop
Merge pull request #1 from bmake/feature/NavDrawer
9e0090a 
Feature/nav drawer
add Makefile with options start, stop, upload, clean-database
5dc4682 
add .dockerignore
add .editorconfig
edit .gitignore
add Dockerfile
add Dockerfile_production
add docker-compose.yml
add docker-compose_production.yml
@ArkanEmre
Merge pull request #2 from bmake/feature/Makefile
ef1fef2 
add Makefile with options start, stop, upload, clean-database
-add browser-language-detection for default language
3dc060d 
-add vue-flag-icon plugin
add fixed card size
2af6c02 
add fixed logo size
add links to video lecture pages
add hyphens to description and max line count (4)
remove full description on hover
Merge remote-tracking branch 'origin/develop' into feature/i18n
92259a5
add flip effect to card
1fd00dc
-progress bar
92e3724
-added a progress bar to give visual feedback to the user while data …
146e73d 
…is being pulled
Merge branch 'feature/lectureCards' of https://github.com/bmake/lectu…
b066666 
…res_at_thb into feature/HoverCards
-added overlay with full description, when clicking on the cards
f52a670
Merge branch 'develop' into feature/Loading
5f1dd52
@ArkanEmre
Merge branch 'develop' into feature/i18n
ce9a851
@ArkanEmre
add height property to ProgressBar
c0c1655 
move ProgressBar to Toolbar
Merge branch 'feature/i18n' of https://github.com/bmake/lectures_at_thb…
5a177d5 
… into feature/i18n
-added flag button, that shows the flag of the current page language
63fe197
-moved vue.use(flagIcon) to main.js
2067698
@ArkanEmre
move hyphens css class
b978dbf
-removed circular loading circle
6cd87da
@ArkanEmre
fix conditional-rendering
29968f7 
move vue-flag-icon to i18n.js
reformat code
@ArkanEmre
reformat code
18956ec
@ArkanEmre
fix conditional-rendering
049b49d 
move vue-flag-icon to i18n.js
@ArkanEmre
Merge pull request #3 from bmake/feature/i18n
d448374 
merge feature/i18n into develop
@ArkanEmre
Merge branch 'feature/i18n' of github.com:bmake/lectures_at_thb into …
267ff1d 
…feature/i18n
@ArkanEmre
Merge pull request #6 from bmake/feature/i18n
6eedbdb 
merge feature/i18n
-changed hover card background color + text color
2805fca 
-disabled hover effect on lecture cards
huwenxin and others added 21 commits October 18, 2021 20:28
@huwenxin
change homepage pic
71667ab
@huwenxin
routing to absolute path
d53688e
@huwenxin
banner pic update
bf32c0f
@huwenxin
Merge branch 'develop' into officialServer
e4841c5
@huwenxin
feature fixes
bb8675e
@huwenxin
Merge branch 'develop' into officialServer
971b26d
@huwenxin
feature updates
8daaeab
@huwenxin
solve the problem with browser default language that is not English o…
4bb7c3c 
…r German
@huwenxin
deactiviate search button, activiate FBT department
f5c6600 
Please enter the commit message for your changes. Lines starting
@huwenxin
search symbol deactiviate
c192797
@huwenxin
time format change to match long videos (>1h)
62a34f3
@huwenxin
change design of the homepage
c94ca3d
@huwenxin
change banner pic
dc8ac24
@huwenxin
change color of system bar to thb red
871a55f
@huwenxin
fix language changing problem, add studium generale
98032ed
@huwenxin
comment search icon / function
7d0a111
@huwenxin
add subtitle function,adjust font size of subtitles
a0667bb
@huwenxin
Merge branch 'develop' into officialServer
c3c43cb
@huwenxin
Merge branch 'officialServer' of https://github.com/bmake/lectures_at…
d5ab12b 
…_thb into officialServer
@huwenxin
remove console logs
6debea6
@huwenxin
fix the problem that the thumbnails not showing from google drive
986c081
@huwenxin
Copy link
Contributor Author

update changes in master

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@huwenxin @Airop @ArkanEmre @UniVera