master #6

Closed

karimov-adel wants to merge 39 commits from master into adel_branch_2.0

pull from: master

merge into: collarbone-annihilation:adel_branch_2.0

collarbone-annihilation:een9fix

collarbone-annihilation:anton_branch_2.0

collarbone-annihilation:karimov-adel-patch-1

collarbone-annihilation:fedor_branch

collarbone-annihilation:fed

collarbone-annihilation:vladimir_branch

collarbone-annihilation:adel_branch_2.0

collarbone-annihilation:adel_branch

collarbone-annihilation:front

Conversation 0 Commits 39 Files Changed 97 +4021 -1733

karimov-adel commented 2024-09-12 16:19:42 +00:00

Member

Copy Link

No description provided.

karimov-adel added 35 commits 2024-09-12 16:19:42 +00:00

добавлены новые файлы 5ba48ff58f

api/geetMessageNeighbours 45a1662eae

Skeleton for internalapi response completed 5a07cadd4a

error messages after incorrect login. sendmessage. small refactoring 807f0d0eab

изменен login.css a04a791ff2

сделан кривой преход на страницу после нажатия кнопки d328acfb93

Api updated. done everything except for system message sending, user registration and any testing 925229bbda

Fixed buildscript 7de352ce1c

Fixed some bugs, added user registration, tweaked syntax of admin control commands 632d4069ac

asdasdasdasdasdasdas 5062e1ab70

Added some cool svg icons 711e495f15

New logo cc8aa516bb

Merge branch 'master' into chat-wg-test ... c009b848b5

To pull all the images

добавлены новые файлы 91d88dc06c

Fixed some bugs in nytl, een9 ad chat, wrote a skeleton for list-rooms, chat pages, finished login, view-profile, edit-profile-pages. chat-members page still needs attention 07711a93b0

Doing frontend now. Added these cool popup windows in list-rooms.nytl.html 21a23be96e

fixed some backend bugs. Finished /list-rooms. Now we have these cool popup windows before serious actions 9283590122

Fixed some problems with deletion buttons in /list-rooms, wrote a sketch for /chat-members 3a8bdb99ec

Fixed a lot of server-side bugs, /list-rooms page bugs. Added favicon, finished /chat-members page fc721d7f5c

Making /chat. Unstable save. Working message loading. Styles of messages are not perfect. Several iu9cachat bugs fixed b9626aa860

FIRST WORKING VERSION OF IU9 CA WEB CHAT. IT'S WORKINGgit add -A! YOU CAN SEND STUFF INTO CHAT AND IT WILL LOAD UP ON ANOTHER DEVICE EEEEEEEE 2219653f40

minor fixes, added system messages 68094f904d

First efforts to internationalize site b0d7a35eb2

Translated to english 0ed8150c4e

Translated everything to ru-RU 270549c21a

Added cumping to chat widget 6813c6249d

Fixed annoying bugs, added reassignment of anchor. FIRST RELEASE VERSION 249f5e6b78

Added registration bc2c7d31c9

Merge pull request 'Added registration' (#5) from fed into master ... d1bfe44d0d

Reviewed-on: #5

many folders have been updated, and html, js, and css extension files have also been changed 5d4d1149d4

changed the rooms page 1eb3f08b2c

что-то 14a8c1755e

rooms are centralized 61ef791c89

убраны два файла для мерджа febf3af534

inaccuracies have been eliminated 16a6ee963a

yakovlev-anton added 4 commits 2024-09-14 00:59:07 +00:00

Добавлена страница настроек чата d7aaeccfa2

Добавлена реализация http-запросов на странице chatSettings.nytl.html 29e06059d5

Merge remote-tracking branch 'origin/anton_branch_2.0' 9f0331ed62

Удалил лишние файлы chatSettings f6c649f9db

gregory closed this pull request 2024-12-24 20:20:08 +00:00

Pull request closed

Please reopen this pull request to perform a merge.

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No Label

Milestone

Clear milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

No Assignees

2 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: collarbone-annihilation/iu9-ca-web-chat#6

No description provided.