Feature/t17 - #7

Open

tcrurav wants to merge 785 commits into

eduappdevs:mainfrom

eduapp-project:feature/t17

This pull request is big! We're only showing the most recent 250 commits

Commits on Jun 29, 2022

Resource creation author is logged-in user
Cristina-SM
committed
168f0a1
merge/features-cristina
Cristina-SM
committed
04e5822
clear event
Cristina-SM
committed
e9fc87b
Merge branch 'features/cristina' into develop
Cristina-SM
committed
f24d649
fix bug standard Modal
Cristina-SM
committed
7574784
fixed bug visual in initialization
Cristina-SM
committed
1fcd068
Added remote filtration for resources
SkinnyDevi
committed
d6833a7
Added remote filtration to sessions
SkinnyDevi
committed
20ad446
Added order param for future use
SkinnyDevi
committed
3807a37
Added remote filtration to events
SkinnyDevi
committed
d7f5581
Added filter routes
SkinnyDevi
committed
6b7f8a5
Added remote filtration to tuitions
SkinnyDevi
committed
a5e8cb4
Added remote filtration to teachers
SkinnyDevi
committed
133ce2c
Added remote filtration to roles
SkinnyDevi
committed
dda0510
Added remote filtration to chat bases
SkinnyDevi
committed
8b87064
Added remote filtration to chat participants
SkinnyDevi
committed
80075df

Commits on Jun 30, 2022

Corrected data types for checkbox and number in ef
SkinnyDevi
committed
b6dc323
Added remote filtering including extra fields
SkinnyDevi
committed
e18ddd9
Added extra fields to tables
SkinnyDevi
committed
b4e798b
Converted language prop delegation to context
SkinnyDevi
committed
eb12f9b
Added save function to last component viewed
SkinnyDevi
committed
3e6fc9f
Modified navbar to force user create institution
SkinnyDevi
committed
39bf3de
Updated version numbers
SkinnyDevi
committed
280dd2f
fix bug in admin site
Cristina-SM
committed
b706176

Commits on Jul 1, 2022

Added joint filtration with extra fields
SkinnyDevi
committed
167440d
Fixed params resetter for each component
SkinnyDevi
committed
3da4def
Fixed mixed filtration bug
SkinnyDevi
committed
086e814

Commits on Jul 4, 2022

Added sorting ability to tables
SkinnyDevi
committed
fcca6a8

Commits on Jul 5, 2022

Changed how NGINX connects to each container
SkinnyDevi
committed
4ab9647

Commits on Jul 6, 2022

Added configuration for ports and subdomains
SkinnyDevi
committed
568a99e

Commits on Jul 7, 2022

Various fixes + add deployment guide
SkinnyDevi
committed
e02126d
Redesigned query filtration system
SkinnyDevi
committed
eb089e9
Changed bin
SkinnyDevi
committed
c94b786
Added code documentation + fixes and refactoring.
SkinnyDevi
committed
0a6298d

Commits on Jul 9, 2022

implementing login either with username and email
adriceniza
committed
3ba8f7e
improved search filter system pull
adriceniza
committed
40847f8
merge
adriceniza
committed
377f82d

Commits on Jul 11, 2022

Added docs to general components
SkinnyDevi
committed
2af0961
Finished documenting frontend.
SkinnyDevi
committed
26f7cc8
+name, surname - login either w username or email
adriceniza
committed
d3d6dfc
error fix
adriceniza
committed
a077b00
show user username instead of userinfos username
adriceniza
committed
c3ae4d5
Profile menu adapted to new fields &improve styles
adriceniza
committed
e8e56c6
some merge changes
adriceniza
committed
728c852
Added docs to the administration app
SkinnyDevi
committed
ff40570

Commits on Jul 12, 2022

Updated the main README
SkinnyDevi
committed
b54e056
Added updated app screenshots
SkinnyDevi
committed
7bbeb0c
Added images to readme
SkinnyDevi
committed
5db36d6
Added developer notes and guides
SkinnyDevi
committed
0ce371f
Fixed headings
SkinnyDevi
authored
4b3fd10
Added docs to code
SkinnyDevi
committed
440e0d6

Commits on Jul 14, 2022

Fixed login for desktop
SkinnyDevi
committed
b56ba6b
Adapted menu for desktop
SkinnyDevi
committed
022272a
Added languages to navbar
SkinnyDevi
committed
b08b42f

Commits on Aug 25, 2022

Various changes
SkinnyDevi
committed
ef8f312
Fixed error
SkinnyDevi
committed
6ef4d2d
Adapted most to desktop
SkinnyDevi
committed
f5fd44e
Updated app versions
SkinnyDevi
committed
97f3796
Fixed logout bug
SkinnyDevi
committed
3568582
Update to message
SkinnyDevi
committed
b9bc283

Commits on Sep 3, 2022

https version
tcrurav
committed
8a557a4
https version
tcrurav
committed
461b03d

Commits on Sep 4, 2022

Commits on Sep 12, 2022

it works in hosting
tcrurav
committed
f968f89

Commits on Sep 14, 2022

fixed some bugs regarding admin panel Sessions and Users sections
mianfiga
committed
39047ac

Commits on Sep 16, 2022

updated ruby version
mianfiga
committed
e67d74c

Commits on Sep 26, 2022

fixed to chat
mianfiga
committed
5d0cab7
Extrafields woring version
mianfiga
committed
e891569

Commits on Oct 4, 2022

Fixed backend notification system, changed backend user dropdown to typeahead, Changed unread count in chats (to be tested)
mianfiga
committed
1b20971

Commits on Oct 9, 2022

fixed profile username change, unread chat order, chat list z-index
mianfiga
committed
4f931b0
updating chat seen for unread chat info
mianfiga
committed
270b586
session links fixed
mianfiga
committed
045a4e3

Commits on Oct 10, 2022

README.md changes
tcrurav
committed
d3c2bc0
README.md changes
tcrurav
committed
94b4e5a

Commits on Oct 11, 2022

Development issues in README.md
tcrurav
committed
e23f7b7
improved admin user interface, fixed user filtering
mianfiga
committed
93ea6df

Commits on Oct 13, 2022

wq
mianfiga
committed
ea3b249
Fixed order issue in user list
mianfiga
committed
f58ba70

Commits on Oct 14, 2022

Making deployment instructions easier
tcrurav
committed
ad75656
Some README.md fixing
tcrurav
committed
fb974b8
Added Danish tranlations

Thøger Johansen (TJO | OJ)
authored and
Thøger Johansen (TJO | OJ)
committed
6be709d
git clone added to README.md
tcrurav
committed
4546c05
fixed hiding menu option in desktop menu when disabled
mianfiga
committed
8c66135
Merge pull request #1 from eduapp-project/sosu
mianfiga
authored
185cbc4
Merge pull request #2 from eduapp-project/rincon
mianfiga
authored
5368599
some .env changes
tcrurav
committed
05a16f0

Commits on Nov 10, 2022

fixed filtering of enrollments
mianfiga
committed
aeb1c44
frontend danish translations
mianfiga
committed
aed100c

Commits on Nov 14, 2022

login feedback on failing login
mianfiga
committed
7f5f4cf
course API fixed
mianfiga
committed
4bee289

Commits on Nov 16, 2022

fixed subjects api
mianfiga
committed
de6973f
fixed session api
mianfiga
committed
09ffe06

Commits on Nov 17, 2022

Added Romanian translations
mianfiga
committed
a09c322

Commits on Nov 30, 2022

Commits on Dec 20, 2022

Fix imports and add enrollment
PdgarHern
committed
44f2a5e
Add subject user enrollment
PdgarHern
committed
fd52eea

Commits on Jan 16, 2023

Merge pull request #5 from eduapp-project/issue/5423
mianfiga
authored
aec4044
Change frontend lateral menu
PdgarHern
committed
3db5745
Merge pull request #6 from eduapp-project/issue/5436
mianfiga
authored
c8a6804
Change frontend resources dropdown
PdgarHern
committed
dd7e00b
Merge pull request #8 from eduapp-project/issue/5438
mianfiga
authored
678ad7d
Merge pull request #9 from eduapp-project/develop
mianfiga
authored
2117006

Commits on Jan 17, 2023

Add deletion confirmation box
PdgarHern
committed
2ff38b4
Add participant in enrollment
PdgarHern
committed
f02b4a1

Commits on Jan 18, 2023

Change language icons
PdgarHern
committed
b095a0d
Add subject enrollments to profile
PdgarHern
committed
84ffed8
Change profile to separate page
PdgarHern
committed
b913384

Commits on Jan 23, 2023

Merge pull request #10 from eduapp-project/issue/5468
mianfiga
authored
3f6b296
Merge pull request #11 from eduapp-project/issue/5477
mianfiga
authored
0fce2db
Add functionality related with calendar sessions
PdgarHern
committed
d242a69

Commits on Jan 24, 2023

Merge pull request #12 from eduapp-project/issue/5477-2
mianfiga
authored
90717be
some .env changes

tcrurav
authored and
AleVeraM
committed
ce00a35
Save avatar image in local stoarage instead of firabase
AleVeraM
committed
cb97704

Commits on Jan 26, 2023

Fix url image

AleVeraM
authored and
PdgarHern
committed
a80bdeb
Fix saveUserOffile
AleVeraM
committed
4f20166
Merge branch 'issue/5482' of github.com:eduapp-project/eduapp into issue/5482
AleVeraM
committed
0def3f1

Commits on Feb 1, 2023

Fix "is repited" modal
AleVeraM
committed
434eebf

Commits on Feb 6, 2023

some .env changes

tcrurav
authored and
AleVeraM
committed
b29a096
Add functionality related with calendar sessions

PdgarHern
authored and
AleVeraM
committed
e44f086
Fix create groupchat
AleVeraM
committed
7327e72
Fix errors fo create groupchat
AleVeraM
committed
3e6a9a7
Merge pull request #13 from eduapp-project/issue/5482
mianfiga
authored
aca5af0
Merge pull request #16 from eduapp-project/fix/sessions
mianfiga
authored
539e03f

Commits on Feb 7, 2023

Add functionality related with calendar sessions

PdgarHern
authored and
AleVeraM
committed
04599f2
Fix create groupchat
AleVeraM
committed
9c53011
Complite rebase with development
AleVeraM
committed
8603800
Merge pull request #15 from eduapp-project/issue/5494
mianfiga
authored
20467cc
Merge pull request #17 from eduapp-project/develop
mianfiga
authored
465cc7f
added course_id to create on subject controller
mianfiga
committed
4007ee3
Merge pull request #19 from eduapp-project/hotfix/course_id_missing
mianfiga
authored
752be64

Commits on Feb 8, 2023

minor hotfixes
mianfiga
committed
7973603

Commits on Mar 1, 2023

Merge pull request #18 from eduapp-project/hotfix/course_id_missing
mianfiga
authored
8cbaf51
Merge pull request #23 from eduapp-project/develop
mianfiga
authored
2af13ef
Add push notifications
AleVeraM
committed
4493ada
minor hotfixes

mianfiga
authored and
AleVeraM
committed
5bb6c2e
Add push notifications
AleVeraM
committed
089fbd8
Merge branch 'issue/5555' of github.com:eduapp-project/eduapp into issue/5555
AleVeraM
committed
45ea196
Merge pull request #24 from eduapp-project/issue/5555
mianfiga
authored
051a1cf
Merge pull request #25 from eduapp-project/develop
mianfiga
authored
9ab2d8f

Commits on Mar 2, 2023

fix: User profiles settings
PdgarHern
committed
693a57c
fix: Add chat participants in enrollment
PdgarHern
committed
a0dad61
fix: Group chat creation fails to create
PdgarHern
committed
8640e67
fix: Double enrollment to chat
PdgarHern
committed
2cf6144
fix: ADMIN: deletion of subject chat fails
PdgarHern
committed
c37e92c
fix: Resource subject list is empty
PdgarHern
committed
81c2143
Better implementation of notifications
AleVeraM
committed
8f7e1a8
Better implementation of notifications
AleVeraM
committed
95bb7a9
Merge branch 'issue/5555' of github.com:eduapp-project/eduapp into issue/5555
AleVeraM
committed
f54b69e

Commits on Mar 15, 2023

Merge pull request #27 from eduapp-project/issue/5555
mianfiga
authored
c840373
Merge pull request #26 from eduapp-project/fixes
mianfiga
authored
d65ccbf
Merge pull request #28 from eduapp-project/develop
mianfiga
authored
b9f2230

Commits on Mar 24, 2023

FIX toolbar order
tcrurav
committed
0678d34
Merge pull request #29 from eduapp-project/develop
mianfiga
authored
72efe82

Commits on Mar 29, 2023

FIX progress bar
tcrurav
committed
bc69cc3

Commits on Mar 30, 2023

Commits on Mar 31, 2023

FIX add buttons to right side
tcrurav
committed
0c131e9

Commits on Apr 4, 2023

Commits on Apr 5, 2023

Change external_id to string and change sessionsTemplate image
AleVeraM
committed
caba983
Merge pull request #34 from eduapp-project/issue/change_externalid
tcrurav
authored
f668c97
Fixing handleChange everywhere
tcrurav
committed
55f9df7
Merge branch 'develop' into feature/t04
tcrurav
committed
f213e98
Fix chat when don't have teacher
AleVeraM
committed
20a0eb5
Add case insensitive to search
AleVeraM
committed
03f80ae
FIX edit in sessions
tcrurav
committed
a0772ed
Merge pull request #36 from eduapp-project/issue/5718
tcrurav
authored
2f8a0ce
Merge pull request #35 from eduapp-project/issue/5683
tcrurav
authored
111f8ae
Merge branch 'develop' into feature/t04
tcrurav
committed
c0f92f6
Merge pull request #37 from eduapp-project/feature/t04
tcrurav
authored
e0cfd01
Merge pull request #38 from eduapp-project/develop
tcrurav
authored
12f81e5

Commits on Apr 6, 2023

FIX edit related issues
tcrurav
committed
3964247
Merge pull request #39 from eduapp-project/feature/t05
tcrurav
authored
52d143c
Merge pull request #40 from eduapp-project/develop
tcrurav
authored
9e6444d
Fixes to enrollSubjectsConfig and subjectsConfig
mianfiga
committed
4c3fbf8
Merge pull request #41 from eduapp-project/ma01
mianfiga
authored
e236af1
Hide extrafields and edit from resources
mianfiga
committed
7bb3fae
Merge pull request #42 from eduapp-project/ma01
mianfiga
authored
0ca0bc3
FIX frontend image
tcrurav
committed
2570fe3
Merge branch 'develop' into feature/t06
tcrurav
committed
8c29775
FIX Enrollment (Subjects)
tcrurav
committed
0aaa2e2
Merge pull request #43 from eduapp-project/feature/t06
tcrurav
authored
4517f80
Merge pull request #44 from eduapp-project/develop
tcrurav
authored
3031681

Commits on Apr 7, 2023

FIX photos
tcrurav
committed
a2964bf
Merge pull request #45 from eduapp-project/feature/t07
tcrurav
authored
bc1edd9
Merge pull request #46 from eduapp-project/develop
tcrurav
authored
99dd67e
FIX photos and users filtering
tcrurav
committed
986236f
Fixed userinfo ordering when filtering by user_name
mianfiga
committed
a467fc9
Merge pull request #48 from eduapp-project/feature/t08
tcrurav
authored
28dce35
Merge pull request #49 from eduapp-project/develop
tcrurav
authored
22fac72
some fixes regarding updating sessions due to callbacks updates
mianfiga
committed
0f78394
removed chat field from batch loading
mianfiga
committed
c7763ff
Updated images for session batch loading
mianfiga
committed
0dc3095
Merge pull request #50 from eduapp-project/ma01
mianfiga
authored
09b3a69

Commits on Apr 8, 2023

FIX public folder in docker volume
tcrurav
committed
0dcc146
FIX margin-bottom in calendar and profile
tcrurav
committed
44adcc1
FIX chat is now created only when enrollSubject is successfully created
tcrurav
committed
7d69e95
Merge pull request #51 from eduapp-project/feature/t10
tcrurav
authored
9ccc66f
Merge pull request #52 from eduapp-project/develop
tcrurav
authored
bb8c7a3
FIX chat from home
tcrurav
committed
1326f9d
Merge pull request #53 from eduapp-project/feature/t11
tcrurav
authored
419b07a
Merge pull request #54 from eduapp-project/develop
tcrurav
authored
7a29081
FIX subject chat links work
tcrurav
committed
92b5171
Merge pull request #55 from eduapp-project/feature/t12
tcrurav
authored
61e1536
Merge pull request #56 from eduapp-project/develop
tcrurav
authored
e549de8

Commits on Apr 9, 2023

Fixed: adding events from frontend. backend: chat & participants listing height, event filtering
mianfiga
committed
a3afa2a
Merge branch 'develop' into ma01
mianfiga
committed
e47369a
Merge pull request #57 from eduapp-project/ma01
mianfiga
authored
62b0673
Admin: Fixed sorting in courses and subjects
mianfiga
committed
8c68f08
Merge pull request #58 from eduapp-project/ma01
mianfiga
authored
fc76f3b
Admin: fixed removing of sessions by compliting the useCallback momoized variabled
mianfiga
committed
1c02302
Merge pull request #59 from eduapp-project/ma01
mianfiga
authored
c04e8c8
Merge pull request #60 from eduapp-project/develop
tcrurav
authored
3dfa125
Subjects: prevent ordering when array fixed next session calculation
mianfiga
committed
2123ccb
FIX chat sender name in messages with loggout senders
tcrurav
committed
a584f18
Merge branch 'develop' into feature/t14
tcrurav
committed
1961c2d
Merge branch 'develop' of https://github.com/eduapp-project/eduapp into develop
tcrurav
committed
d05a094
Merge branch 'develop' into feature/t14
tcrurav
committed
20710f6
FIX search in chat menu
tcrurav
committed
1a05ba5
Merge pull request #61 from eduapp-project/feature/t14
tcrurav
authored
40d339f
Fixed resource access permissions based on subject instead of course
mianfiga
committed
725eb13
Added logic to hide or show edit/remove buttons, based on permissions
mianfiga
committed
c3ae3f5
Fixed Event Batch Loading, filtering and pagination
mianfiga
committed
af07c23

Commits on Apr 10, 2023

FIX MainChatInfo now showing
tcrurav
committed
9f742bc
Merge pull request #63 from eduapp-project/feature/t15
tcrurav
authored
a85a1ff
updated event batch loading help photo
mianfiga
committed
75f9540
fixed minor console error
mianfiga
committed
72fd130
login now works in frontend
tcrurav
committed
055faac
Merge pull request #66 from eduapp-project/feature/t16
tcrurav
authored
2dd9f03

Commits on Apr 11, 2023

fixed notifications
mianfiga
committed
8aab444
fixed email recovery frontend error
mianfiga
committed
bc8e1ba
changed popup notification to show up when app is visible
mianfiga
committed
0d7edc2
Fix notification from system notification
AleVeraM
committed
5f39fa7
Add new messages number and system chat control
PdgarHern
committed
dfc60d8
FIX backend/storage as docker volume
tcrurav
committed
6111c96
FIX some useCallback issues
tcrurav
committed
0aba400
Merge branch 'develop' into feature/t17
tcrurav
committed
6a4ba45
Merge pull request #69 from eduapp-project/issue/5742
mianfiga
authored
8317b85
Merge pull request #68 from eduapp-project/issue/5743
mianfiga
authored
d6bd969
Merge branch 'develop' into feature/t17
tcrurav
committed
6fad5e1