Labels Milestones

Resolve "Вёрстка страницы списка конференций" #160

Merged

VladimirZarayskiy merged 1 commits from 53-vyorstka-stranitsy-spiska-konferentsiy into dev 5 years ago

Conversation 25 Commits 1 Files Changed 5

VladimirZarayskiy commented 5 years ago (Migrated from gitlab.com)

Closes #53

Closes #53

VladimirZarayskiy commented 5 years ago (Migrated from gitlab.com)

changed milestone to %5

changed milestone to %5

VladimirZarayskiy commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• a236fc50 - #53 added datatables lib support

Compare with previous version

added 1 commit <ul><li>a236fc50 - #53 added datatables lib support</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/33/diffs?diff_id=36671452&start_sha=ae58a5b6e4b349696dd74ee7771c8eb3934c1b46)

VladimirZarayskiy commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• 6296b661 - #53 added conference js file

Compare with previous version

added 1 commit <ul><li>6296b661 - #53 added conference js file</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/33/diffs?diff_id=36671528&start_sha=a236fc50bc34047193c735fa03c8cb78ef2197d5)

VladimirZarayskiy commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• fd22aecd - #53 added supporting bootstrap style

Compare with previous version

added 1 commit <ul><li>fd22aecd - #53 added supporting bootstrap style</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/33/diffs?diff_id=36814093&start_sha=6296b661a9dc620a55cee520ee89aadf21b013ef)

VladimirZarayskiy commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• 5dc54dda - #53 added supporting russian language, added linkable row in table

Compare with previous version

added 1 commit <ul><li>5dc54dda - #53 added supporting russian language, added linkable row in table</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/33/diffs?diff_id=36893604&start_sha=fd22aecd22b340eab42c0947e2802889f6c802b7)

romanov73 commented 5 years ago (Migrated from gitlab.com)

от верстки таблицами лучше отказаться, сложнее будет адаптировать приложение под разные устройства

от верстки таблицами лучше отказаться, сложнее будет адаптировать приложение под разные устройства

VladimirZarayskiy commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• 1364e8e8 - #53 added multi selection, added selection of all items

Compare with previous version

added 1 commit <ul><li>1364e8e8 - #53 added multi selection, added selection of all items</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/33/diffs?diff_id=37032943&start_sha=5dc54dda8b795f351956463af69d9d606c1f2c05)

VladimirZarayskiy commented 5 years ago (Migrated from gitlab.com)

changed this line in version 6 of the diff

changed this line in [version 6 of the diff](https://gitlab.com/romanov73/ng-tracker/merge_requests/33/diffs?diff_id=37050402&start_sha=1364e8e84d9c8276f14cd78db010c1d159d545e1#6e27e234eba34735c87454fa0b5e77ee35b57dec_26_21)

VladimirZarayskiy commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• cb673d87 - #53 remake of conference list without table

Compare with previous version

added 1 commit <ul><li>cb673d87 - #53 remake of conference list without table</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/33/diffs?diff_id=37050402&start_sha=1364e8e84d9c8276f14cd78db010c1d159d545e1)

VladimirZarayskiy commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• 89e0d1a2 - #53 customization css styles

Compare with previous version

added 1 commit <ul><li>89e0d1a2 - #53 customization css styles</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/33/diffs?diff_id=37074301&start_sha=cb673d87829c3d66eb98386bd8c621b722a27cf8)

VladimirZarayskiy commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• d356c219 - #53 added buttons, added bottom pagination

Compare with previous version

added 1 commit <ul><li>d356c219 - #53 added buttons, added bottom pagination</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/33/diffs?diff_id=37108600&start_sha=89e0d1a291f8269891bc3c857702aa3623464ad7)

VladimirZarayskiy commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• 9182a710 - #53 added ping style

Compare with previous version

added 1 commit <ul><li>9182a710 - #53 added ping style</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/33/diffs?diff_id=37113378&start_sha=d356c219449c9411c29713d5f1c015e05ecc7caf)

VladimirZarayskiy commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• 50dbe8cb - #53 added custom checkboxes, added selection of all conferences

Compare with previous version

added 1 commit <ul><li>50dbe8cb - #53 added custom checkboxes, added selection of all conferences</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/33/diffs?diff_id=37309628&start_sha=9182a71015eb61296d1cea1525ad46f6d583bbe3)

VladimirZarayskiy commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• edd6aee0 - #53 fast fix

Compare with previous version

added 1 commit <ul><li>edd6aee0 - #53 fast fix</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/33/diffs?diff_id=37309794&start_sha=50dbe8cb8f8411dc8730e76d29508648be806e74)

VladimirZarayskiy commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• ea4e25ad - #53 added years filter forms

Compare with previous version

added 1 commit <ul><li>ea4e25ad - #53 added years filter forms</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/33/diffs?diff_id=37312994&start_sha=edd6aee00f71028796c3f31057d3e1ba8527cd72)

VladimirZarayskiy commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• bff824bc - #53 added control panel

Compare with previous version

added 1 commit <ul><li>bff824bc - #53 added control panel</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/33/diffs?diff_id=37343472&start_sha=ea4e25aded00f92412ec2774a901c55ca4ad4b08)

VladimirZarayskiy commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• 99468a0c - #53 added actual.html, css fixes

Compare with previous version

added 1 commit <ul><li>99468a0c - #53 added actual.html, css fixes</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/33/diffs?diff_id=37344497&start_sha=bff824bc0603f4939cb162b6c876ede5302133a7)

VladimirZarayskiy commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• cc1f5c00 - #53 adapted, refactor css

Compare with previous version

added 1 commit <ul><li>cc1f5c00 - #53 adapted, refactor css</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/33/diffs?diff_id=37347038&start_sha=99468a0cea5799fd01115c8e791c218fcde46c91)

VladimirZarayskiy commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• 79cfd7c0 - #53 added pagination style, css fixes

Compare with previous version

added 1 commit <ul><li>79cfd7c0 - #53 added pagination style, css fixes</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/33/diffs?diff_id=37404234&start_sha=cc1f5c00c5559af949c4322fcaefdd8c143e694d)

VladimirZarayskiy commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• 01b082c3 - #53 changed style like in module "papers"

Compare with previous version

added 1 commit <ul><li>01b082c3 - #53 changed style like in module &quot;papers&quot;</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/33/diffs?diff_id=37750228&start_sha=79cfd7c0ab04778cf3e3165608633bb03d8d3700)

VladimirZarayskiy commented 5 years ago (Migrated from gitlab.com)

assigned to @romanov73

assigned to @romanov73

VladimirZarayskiy commented 5 years ago (Migrated from gitlab.com)

unmarked as a Work In Progress

unmarked as a **Work In Progress**

romanov73 commented 5 years ago (Migrated from gitlab.com)

resolved all discussions

resolved all discussions

romanov73 commented 5 years ago (Migrated from gitlab.com)

merged

merged

romanov73 commented 5 years ago (Migrated from gitlab.com)

mentioned in commit e98445bb48

mentioned in commit e98445bb48ff976604cceaca67a728b23feada0e

The pull request has been merged as e98445bb48.

You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.

git checkout -b 53-vyorstka-stranitsy-spiska-konferentsiy dev

git pull origin 53-vyorstka-stranitsy-spiska-konferentsiy

Step 2:

Merge the changes and update on Gitea.

git checkout dev

git merge --no-ff 53-vyorstka-stranitsy-spiska-konferentsiy

git push origin dev

Sign in to join this conversation.

Reviewers

Request review

No reviewers

Labels

Apply labels

Clear labels   

backend

  

bug

  

frontend

  

выполнить первой

  

выполняется

  

конференции

  

события

  

статьи

No Label

backend

bug

frontend

выполнить первой

выполняется

конференции

события

статьи

Milestone

Set milestone

Clear milestone

No items

No Milestone

Конференции

Projects

Set Project

Clear projects

No project

Assignees

Assign users

Clear assignees

No Assignees

1 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: romanov73/ng-tracker#160

Write Preview

Loading…

Cancel

Save

There is no content yet.