The SIO2 project
  1. The SIO2 project
  2. SIO-1235

Merge szkopul with master

        Details

          Activity

          Ascending order - Click to sort in descending order
          Mateusz Kwapich made changes -
          Field Original Value New Value
          Affects Version/s 0.1.9 [ 11303 ]
          Affects Version/s 0.1.8 - Happy Easter Sprint [ 11302 ]
          Mateusz Kwapich made changes -
          Fix Version/s 0.1.9 [ 11303 ]
          Maciej Matraszek made changes -
          Summary Merge master into szkopul branch Merge szkopul with master
          Hide
          Permalink
          Gerrit Gerrit added a comment -
          Change I436bc46140420e6b78719346c4b23be936cfabc3, patchset 2
          https://gerrit.sio2project.mimuw.edu.pl/1669

          SIO-1235 Merge szkopul with master

          Change-Id: I436bc46140420e6b78719346c4b23be936cfabc3
          Show
          Gerrit Gerrit added a comment - Change I436bc46140420e6b78719346c4b23be936cfabc3, patchset 2 https://gerrit.sio2project.mimuw.edu.pl/1669 SIO-1235 Merge szkopul with master Change-Id: I436bc46140420e6b78719346c4b23be936cfabc3
          Hide
          Permalink
          Gerrit Gerrit added a comment -
          Change I436bc46140420e6b78719346c4b23be936cfabc3, patchset 3
          https://gerrit.sio2project.mimuw.edu.pl/1669

          SIO-1235 Merge szkopul with master

          Change-Id: I436bc46140420e6b78719346c4b23be936cfabc3
          Show
          Gerrit Gerrit added a comment - Change I436bc46140420e6b78719346c4b23be936cfabc3, patchset 3 https://gerrit.sio2project.mimuw.edu.pl/1669 SIO-1235 Merge szkopul with master Change-Id: I436bc46140420e6b78719346c4b23be936cfabc3
          Hide
          Permalink
          Gerrit Gerrit added a comment -
          Change I436bc46140420e6b78719346c4b23be936cfabc3, patchset 4
          https://gerrit.sio2project.mimuw.edu.pl/1669

          SIO-1235 Merge szkopul with master

          Conflicts:
          oioioi/base/tests/__init__.py
          oioioi/contests/urls.py
          oioioi/contests/views.py
          oioioi/default_settings.py
          oioioi/deployment/settings.py.template
          oioioi/oi/tests.py
          oioioi/participants/tests.py
          oioioi/participants/views.py
          oioioi/teachers/views.py

          Change-Id: I436bc46140420e6b78719346c4b23be936cfabc3
          Show
          Gerrit Gerrit added a comment - Change I436bc46140420e6b78719346c4b23be936cfabc3, patchset 4 https://gerrit.sio2project.mimuw.edu.pl/1669 SIO-1235 Merge szkopul with master Conflicts: oioioi/base/tests/__init__.py oioioi/contests/urls.py oioioi/contests/views.py oioioi/default_settings.py oioioi/deployment/settings.py.template oioioi/oi/tests.py oioioi/participants/tests.py oioioi/participants/views.py oioioi/teachers/views.py Change-Id: I436bc46140420e6b78719346c4b23be936cfabc3
          Maciej Matraszek made changes -
          Status New [ 10000 ] Open [ 1 ]
          Maciej Matraszek made changes -
          Status Open [ 1 ] In Progress [ 3 ]
          Hide
          Permalink
          Maciej Matraszek added a comment -
          Tada
          Show
          Maciej Matraszek added a comment - Tada
          Maciej Matraszek made changes -
          Status In Progress [ 3 ] Resolved [ 5 ]
          Assignee Maciej Matraszek [ matrach ] Szymon Acedański [ accek ]
          Resolution Fixed [ 1 ]
          Szymon Acedański made changes -
          Status Resolved [ 5 ] Closed [ 6 ]
          Transition Time In Source Status Execution Times Last Executer Last Execution Date
          New New Open Open
          		57d 1h 19m 1 Maciej Matraszek 2013-05-31 19:03
          Open Open In Progress In Progress
          		1s 1 Maciej Matraszek 2013-05-31 19:03
          In Progress In Progress Resolved Resolved
          		7d 7h 59m 1 Maciej Matraszek 2013-06-8 3:03
          Resolved Resolved Closed Closed
          		478d 18h 38m 1 Szymon Acedański 2014-09-29 21:42

            People

            • Assignee:
              Szymon Acedański
              Reporter:
              Maciej Matraszek
            • Votes:
              0 Vote for this issue
              Watchers:
              0 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: