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

Blessing #34

Open
wants to merge 30 commits into
base: main
Choose a base branch
from
Open

Blessing #34

wants to merge 30 commits into from

Commits on Feb 9, 2021

  1. SMS Flow

    @Bethiane
    Bethiane committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    4647d9d View commit details
    Browse the repository at this point in the history

  2. Night end

    @Bethiane
    Bethiane committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    003dca7 View commit details
    Browse the repository at this point in the history

  3. End day

    @Bethiane
    Bethiane committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    09635b6 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2021

  1. Left commits

    @Bethiane
    Bethiane committed Feb 24, 2021
    Configuration menu
    Copy the full SHA
    6e24ff6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'blessing' of https://github.com/Ghost-Lab-Official/spir… 

    …al-system_console-version into blessing
    @a-belard
    a-belard committed Feb 24, 2021
    Configuration menu
    Copy the full SHA
    7093a20 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'mike' of https://github.com/Ghost-Lab-Official/spiral-s… 

    …ystem_console-version into blessing
    @a-belard
    a-belard committed Feb 24, 2021
    Configuration menu
    Copy the full SHA
    992a3b6 View commit details
    Browse the repository at this point in the history

  4. Fix import issues

    @a-belard
    a-belard committed Feb 24, 2021
    Configuration menu
    Copy the full SHA
    06edbb3 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2021

  1. Protect some pages

    @hirwablessing
    hirwablessing committed Feb 28, 2021
    Configuration menu
    Copy the full SHA
    16869e8 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2021

  1. loop in each view

    @Bethiane
    Bethiane committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    b767c90 View commit details
    Browse the repository at this point in the history

  2. Fix auth issues

    @hirwablessing
    hirwablessing committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    3919b85 View commit details
    Browse the repository at this point in the history

  3. 2 March

    @Bethiane
    Bethiane committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    ac97336 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'denyse' of https://github.com/Ghost-Lab-Official/spiral… 

    …-system_console-version into blessing
    @hirwablessing
    hirwablessing committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    b93567a View commit details
    Browse the repository at this point in the history

  5. Na none

    @Bethiane
    Bethiane committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    6534175 View commit details
    Browse the repository at this point in the history

  6. Add settings

    @hirwablessing
    hirwablessing committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    df486c5 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2021

  1. Navigation

    @Bethiane
    Bethiane committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    db34343 View commit details
    Browse the repository at this point in the history

  2. New morning

    @Bethiane
    Bethiane committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    780f384 View commit details
    Browse the repository at this point in the history

  3. Ignore out folder

    @hirwablessing
    hirwablessing committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    c23b8f6 View commit details
    Browse the repository at this point in the history

  4. ignoring .out

    @hirwablessing
    hirwablessing committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    5117e7c View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/Bethiane' into blessing 

    # Conflicts:
#	.idea/libraries/mysql_connector_java_5_1_49.xml
#	config.properties
#	out/production/spiral-spot-management-system/com/spiralSpotManagement/Client/Main.class
#	out/production/spiral-spot-management-system/com/spiralSpotManagement/Client/View/UserView.class
#	spiral-spot-management-system.iml
#	src/com/spiralSpotManagement/Client/Main.java
    @hirwablessing
    hirwablessing committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    3ab13e5 View commit details
    Browse the repository at this point in the history

  6. Merge Bethiane into blessing

    @hirwablessing
    hirwablessing committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    e72c74f View commit details
    Browse the repository at this point in the history

  7. New: Ignore .iml and .xml files

    @hirwablessing
    hirwablessing committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    6490cdf View commit details
    Browse the repository at this point in the history

  8. New: Ignore .iml and .xml files

    @hirwablessing
    hirwablessing committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    f87bab9 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'main' of https://github.com/Ghost-Lab-Official/spiral-s… 

    …ystem_console-version into blessing
    @hirwablessing
    hirwablessing committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    ad08bcd View commit details
    Browse the repository at this point in the history

  10. Ignore files

    @hirwablessing
    hirwablessing committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    4d0517e View commit details
    Browse the repository at this point in the history

  11. Merge branch 'blessing' of https://github.com/Ghost-Lab-Official/spir… 

    …al-system_console-version into blessing
    @hirwablessing
    hirwablessing committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    74bddf4 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2021

  1. Merge branch 'main' of https://github.com/Ghost-Lab-Official/spiral-s… 

    …ystem_console-version into blessing
    @hirwablessing
    hirwablessing committed Mar 4, 2021
    Configuration menu
    Copy the full SHA
    d990f20 View commit details
    Browse the repository at this point in the history

  2. fix conflicts

    @hirwablessing
    hirwablessing committed Mar 4, 2021
    Configuration menu
    Copy the full SHA
    b097512 View commit details
    Browse the repository at this point in the history

  3. Fix: errors

    @hirwablessing
    hirwablessing committed Mar 4, 2021
    Configuration menu
    Copy the full SHA
    7077de7 View commit details
    Browse the repository at this point in the history

  4. Fix: renew functions

    @hirwablessing
    hirwablessing committed Mar 4, 2021
    Configuration menu
    Copy the full SHA
    a7a8002 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2021

  1. Remove unwanted comments

    @hirwablessing
    hirwablessing authored Jun 3, 2021
    Configuration menu
    Copy the full SHA
    ddea1da View commit details
    Browse the repository at this point in the history