From 0517708d6b57dcc112fccdeb71783d6a3f12b0b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anton=20Luka=20=C5=A0ijanec?= Date: Fri, 7 Feb 2020 16:14:11 +0100 Subject: changed version to 1.0.7-beta --- pages/about.html | 2 +- pages/changelog.html | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'pages') diff --git a/pages/about.html b/pages/about.html index 22b36a3..2877999 100644 --- a/pages/about.html +++ b/pages/about.html @@ -71,7 +71,7 @@

BežiApp

-
Version 1.0.6-beta
+
Version 1.0.7-beta
diff --git a/pages/changelog.html b/pages/changelog.html index 7e7483c..1b689d7 100644 --- a/pages/changelog.html +++ b/pages/changelog.html @@ -46,7 +46,13 @@

Changelog

diff --git a/pages/absences.html b/pages/absences.html index ae7a23b..652eae8 100644 --- a/pages/absences.html +++ b/pages/absences.html @@ -54,6 +54,7 @@
  • Grades
  • Teachers
  • Absences
  • +
  • Messaging
  • @@ -90,4 +91,4 @@ - \ No newline at end of file + diff --git a/pages/gradings.html b/pages/gradings.html deleted file mode 100644 index 676b5ad..0000000 --- a/pages/gradings.html +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - Gradings - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    -
    -
    - - - - \ No newline at end of file diff --git a/pages/messaging.html b/pages/messaging.html new file mode 100644 index 0000000..3796d4c --- /dev/null +++ b/pages/messaging.html @@ -0,0 +1,141 @@ + + + + + + + Messaging + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +

    Messaging +

    +

    Send a message

    +
    +
    +
    +
    + account_circle + + +
    +
    + subject + + +
    +
    + +
    +
    +
    +
    + mode_edit + + +
    +
    +
    +
    +

    Messages

    + + + + +
    +
    + + + + + + diff --git a/pages/teachers.html b/pages/teachers.html index 6c4bc19..728c630 100644 --- a/pages/teachers.html +++ b/pages/teachers.html @@ -54,6 +54,7 @@
  • Grades
  • Teachers
  • Absences
  • +
  • Messaging
  • @@ -99,4 +100,4 @@ - \ No newline at end of file + diff --git a/pages/timetable.html b/pages/timetable.html index f3426f1..57a31c7 100644 --- a/pages/timetable.html +++ b/pages/timetable.html @@ -63,6 +63,7 @@
  • Grades
  • Teachers
  • Absences
  • +
  • Messaging
  • @@ -103,4 +104,4 @@ - \ No newline at end of file + -- cgit v1.2.3 From 64096129ec0fed79d7defb6fddea805c449f7ea6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anton=20Luka=20=C5=A0ijanec?= Date: Sat, 8 Feb 2020 16:43:30 +0100 Subject: big typo fix --- pages/gradings.html | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 pages/gradings.html (limited to 'pages') diff --git a/pages/gradings.html b/pages/gradings.html new file mode 100644 index 0000000..9dc0e0c --- /dev/null +++ b/pages/gradings.html @@ -0,0 +1,101 @@ + + + + + + + Gradings + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    +
    +
    + + + + -- cgit v1.2.3 From d727a370c7586d3380613bbf267ee3bb80f125a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anton=20Luka=20=C5=A0ijanec?= Date: Sat, 8 Feb 2020 16:45:45 +0100 Subject: oops, no appReset() yet --- pages/about.html | 1 - 1 file changed, 1 deletion(-) (limited to 'pages') diff --git a/pages/about.html b/pages/about.html index 8510d33..2877999 100644 --- a/pages/about.html +++ b/pages/about.html @@ -106,7 +106,6 @@ Privacy policy Report a bug / Send a suggestion - Reset the app in case of a stuck version -- cgit v1.2.3 From f27f999c43d27148ea83c224641ec637eaa5b352 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anton=20Luka=20=C5=A0ijanec?= Date: Sat, 8 Feb 2020 16:48:16 +0100 Subject: updated version and added to changelog --- pages/about.html | 3 ++- pages/changelog.html | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'pages') diff --git a/pages/about.html b/pages/about.html index 2877999..ee82104 100644 --- a/pages/about.html +++ b/pages/about.html @@ -52,6 +52,7 @@
  • Grades
  • Teachers
  • Absences
  • +
  • Messaging
  • @@ -71,7 +72,7 @@

    BežiApp

    -
    Version 1.0.7-beta
    +
    Version 1.0.8-beta
    diff --git a/pages/changelog.html b/pages/changelog.html index 1b689d7..7adb29c 100644 --- a/pages/changelog.html +++ b/pages/changelog.html @@ -46,6 +46,12 @@

    Changelog

    • +
      Version 1.0.8-beta
      +
      +
        +
      • Added messaging
      • +
      +
      Version 1.0.7-beta
      -

      Messaging -

      -

      Send a message

      +

      Send a message

      -
      +
      account_circle @@ -85,52 +84,36 @@
      -
      -
      +
      mode_edit
      +
      + +
      - +
      +
      -

      Messages

      - - - -
      @@ -139,3 +122,4 @@ + diff --git a/pages/privacypolicy.html b/pages/privacypolicy.html index 8daa469..1154a19 100644 --- a/pages/privacypolicy.html +++ b/pages/privacypolicy.html @@ -4,6 +4,7 @@ + Privacy policy @@ -66,4 +67,4 @@ - \ No newline at end of file + diff --git a/pages/teachers.html b/pages/teachers.html index bc9f12b..8e27fb3 100644 --- a/pages/teachers.html +++ b/pages/teachers.html @@ -4,6 +4,7 @@ + Teachers diff --git a/pages/timetable.html b/pages/timetable.html index b721f25..df94a4c 100644 --- a/pages/timetable.html +++ b/pages/timetable.html @@ -4,6 +4,7 @@ + Timetable diff --git a/pages/tos.html b/pages/tos.html index 2f0304c..8623cb2 100644 --- a/pages/tos.html +++ b/pages/tos.html @@ -4,6 +4,7 @@ + Terms and Conditions @@ -118,4 +119,4 @@ - \ No newline at end of file + -- cgit v1.2.3 From 977422a7a3836ed6d7aa1694f11f27b7299522de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anton=20Luka=20=C5=A0ijanec?= Date: Sun, 9 Feb 2020 00:40:58 +0100 Subject: updated version and service worker files --- pages/about.html | 2 +- pages/changelog.html | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'pages') diff --git a/pages/about.html b/pages/about.html index e3e75b8..96990e2 100644 --- a/pages/about.html +++ b/pages/about.html @@ -73,7 +73,7 @@

      BežiApp

      -
      Version 1.0.8-beta
      +
      Version 1.0.9-beta
      diff --git a/pages/changelog.html b/pages/changelog.html index 06877aa..89370ea 100644 --- a/pages/changelog.html +++ b/pages/changelog.html @@ -47,6 +47,12 @@

      Changelog

      • +
        Version 1.0.9-beta
        +
        +
          +
        • Added image sending support to messaging
        • +
        +
        Version 1.0.8-beta
          -- cgit v1.2.3 From 9f0de8234e069e0394d11891f9a14659ae91b319 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anton=20Luka=20=C5=A0ijanec?= Date: Mon, 10 Feb 2020 17:35:35 +0100 Subject: =?UTF-8?q?added=20be=C5=BEiapp=20to=20all=20titles=20and=20added?= =?UTF-8?q?=20page=20name=20to=20navbar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/about.html | 4 ++-- pages/absences.html | 4 ++-- pages/changelog.html | 4 ++-- pages/grades.html | 4 ++-- pages/gradings.html | 4 ++-- pages/messaging.html | 4 ++-- pages/privacypolicy.html | 4 ++-- pages/teachers.html | 4 ++-- pages/timetable.html | 4 ++-- pages/tos.html | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) (limited to 'pages') diff --git a/pages/about.html b/pages/about.html index 96990e2..8b24efc 100644 --- a/pages/about.html +++ b/pages/about.html @@ -5,7 +5,7 @@ - About + About « BežiApp @@ -32,7 +32,7 @@
        +
        Version 1.0.8-beta
        • Added messaging
        +
        Version 1.0.7-beta
        • Enter key now triggers login in the login form
        +
        Version 1.0.6-beta
        • Fixed a typo (related to #5)
        - +
        Version 1.0.5-beta
          @@ -79,7 +82,7 @@
        • Changed promise handling in gradings (#5)
        - +
        Version 1.0.4-beta
        - \ No newline at end of file + -- cgit v1.2.3 From 236628b07d5187d34759aac70d19d4fe89c93077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anton=20Luka=20=C5=A0ijanec?= Date: Mon, 24 Feb 2020 23:42:30 +0100 Subject: meals almost done --- pages/meals.html | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'pages') diff --git a/pages/meals.html b/pages/meals.html index 62dfe31..f59df4a 100644 --- a/pages/meals.html +++ b/pages/meals.html @@ -95,11 +95,11 @@

      -
    • -
    • view_moduleTimetable -
    • +
    • view_moduleTimetable
    • eventGradings
    • receiptGrades
    • -
    • supervisor_accountTeachers
    • -
    • query_builderAbsences -
    • +
    • supervisor_accountTeachers
    • +
    • query_builderAbsences
    • messageMessaging
    • fastfoodMeals
    • @@ -77,7 +74,7 @@

      BežiApp

      -
      Version 1.0.9-beta
      +
      Version 1.0.10-beta
    @@ -89,6 +86,10 @@
  • Rok Štular +      + + message + @@ -100,6 +101,11 @@ + +      + + message +
  • @@ -111,11 +117,11 @@ Terms of Service Privacy policy Report a bug / Send - a suggestion + a suggestion (instagram: @beziapp) - \ No newline at end of file + diff --git a/pages/changelog.html b/pages/changelog.html index dd97c72..b225acb 100644 --- a/pages/changelog.html +++ b/pages/changelog.html @@ -47,6 +47,13 @@

    Changelog

    • +
      Version 1.0.10-beta
      +
      +
        +
      • Added meals
      • +
      +
      +
      Version 1.0.9-beta
        @@ -100,4 +107,4 @@ - \ No newline at end of file + diff --git a/pages/meals.html b/pages/meals.html index f59df4a..c4548f1 100644 --- a/pages/meals.html +++ b/pages/meals.html @@ -134,7 +134,7 @@ exit_to_app -
        +
        -- cgit v1.2.3 From 3adb66d5ea2a5989c2337a3e84be0e19972acf39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anton=20Luka=20=C5=A0ijanec?= Date: Wed, 26 Feb 2020 14:25:35 +0100 Subject: typo --- pages/meals.html | 2 +- pages/messaging.html | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) (limited to 'pages') diff --git a/pages/meals.html b/pages/meals.html index c4548f1..26fe022 100644 --- a/pages/meals.html +++ b/pages/meals.html @@ -111,7 +111,7 @@
        - +
        diff --git a/pages/messaging.html b/pages/messaging.html index eaeb962..1ebe322 100644 --- a/pages/messaging.html +++ b/pages/messaging.html @@ -21,6 +21,7 @@ + @@ -96,7 +97,7 @@
        -
        +
        mode_edit @@ -106,7 +107,19 @@ add_a_photo
        +
        + +
        +
        @@ -135,6 +148,8 @@
        + +

        You can only have 120 messages per message folder, older messages will not be shown. Remember to delete read and sent messages regulary to avoid any issues. -- cgit v1.2.3 From 0623feb601044d3d8443746d5fe9d9b0b73716dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anton=20Luka=20=C5=A0ijanec?= Date: Sun, 1 Mar 2020 17:56:05 +0100 Subject: MIT baje ne potrebuje attributiona --- pages/meals.html | 1 - 1 file changed, 1 deletion(-) (limited to 'pages') diff --git a/pages/meals.html b/pages/meals.html index 26fe022..8b1126e 100644 --- a/pages/meals.html +++ b/pages/meals.html @@ -126,7 +126,6 @@

        - Meals section is powered by https://github.com/rstular/lopolis-api, licensed under MIT.
        diff --git a/pages/changelog.html b/pages/changelog.html index b225acb..e82c09c 100644 --- a/pages/changelog.html +++ b/pages/changelog.html @@ -47,6 +47,13 @@

        Changelog

        • +
          Version 1.0.10-beta
          +
          +
            +
          • Added end-to-end encrypton support to messaging
          • +
          +
          +
          Version 1.0.10-beta
            -- cgit v1.2.3 From fca5b424d41d7126635dd67bba4aa89d1d14c14b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anton=20Luka=20=C5=A0ijanec?= Date: Wed, 4 Mar 2020 21:19:18 +0100 Subject: rewrite of meals.js --- pages/meals.html | 1 + 1 file changed, 1 insertion(+) (limited to 'pages') diff --git a/pages/meals.html b/pages/meals.html index 8b1126e..9e80ec0 100644 --- a/pages/meals.html +++ b/pages/meals.html @@ -14,6 +14,7 @@ + -- cgit v1.2.3 From 1836820ff66d474e5326b99213b2cf56ab611df8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anton=20Luka=20=C5=A0ijanec?= Date: Wed, 4 Mar 2020 23:56:37 +0100 Subject: idk --- pages/meals.html | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) (limited to 'pages') diff --git a/pages/meals.html b/pages/meals.html index 9e80ec0..36ba07b 100644 --- a/pages/meals.html +++ b/pages/meals.html @@ -135,7 +135,56 @@
              -
            + +

            + + + Usage: + + Click on a date to open the collapsible menu with choices and click on a specific meal to select it. Reload the meals when you're done and check the entries. +
            + + Note: + + App was not tested with lunches in mind. Meals probably won't work with lunches and having a lunch subscription may even break its functionality. +
            + + Note: + + If a meal is not present in the Meals collapsible field, this does not necessarily mean it does not exist. Meals that haven't been altered by you or are unchangable + (read-only) are not shown for clarity. +
            + + Note: + + You are welcome to contribute to the LopolisAPI project source (py) and add features, such as checkouts. +
            +

            +
          -- cgit v1.2.3 From af7a53069a4ffb8f041b785d89fe0fcb9f4ca63d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anton=20Luka=20=C5=A0ijanec?= Date: Thu, 5 Mar 2020 23:02:04 +0100 Subject: added i18n, converted HTML files, TODO: js UI responses, TODO: translations So basically, multilanguage support from an JavaScript object. - only slovenian and english - no change language UI yet - only HTML strings are actually translated \- all text is translated, but javascript M.toast and other similar stuff does not pass trough s(), d(), S() and D() functions yet - how to i18n: - add a string to js/lang/bundle.js TO ALL LANGUAGES (translation mgmt sys will have to be created) - HTML: create tags, where 1st ? tells wether to just output the string (s) without dot suffix or (d) to try and append a . (for sentences and paragraphs) if it is not there yet. second ? tells wether to leave lowercase strings (l) or (u) to force the first character of the string be uppercase (capitalize()). - put the key of your string as the innerHTML of the x-?? element. - JS: S("key") and D("key") return capitalized, s() and d() do not change case. --- pages/about.html | 49 +++++++++++++-------- pages/absences.html | 31 +++++++------- pages/changelog.html | 10 ++--- pages/grades.html | 50 +++++++++++----------- pages/gradings.html | 26 ++++++------ pages/meals.html | 108 +++++++++++++---------------------------------- pages/messaging.html | 64 +++++++++++++--------------- pages/privacypolicy.html | 43 ++++++------------- pages/teachers.html | 32 +++++++------- pages/timetable.html | 24 +++++------ pages/tos.html | 97 +++++++++--------------------------------- 11 files changed, 207 insertions(+), 327 deletions(-) (limited to 'pages') diff --git a/pages/about.html b/pages/about.html index 2f41d45..73826a0 100644 --- a/pages/about.html +++ b/pages/about.html @@ -1,5 +1,4 @@ - - + @@ -21,6 +20,7 @@ + @@ -32,7 +32,7 @@
        • -
        • view_moduleTimetable
        • -
        • eventGradings
        • -
        • receiptGrades
        • -
        • supervisor_accountTeachers
        • -
        • query_builderAbsences
        • -
        • messageMessaging
        • -
        • fastfoodMeals
        • +
        • view_moduletimetable
        • +
        • eventgradings
        • +
        • receiptgrades
        • +
        • supervisor_accountteachers
        • +
        • query_builderabsences
        • +
        • messagemessaging
        • +
        • fastfoodmeals
        • - infoAbout + infoabout
        • - exit_to_appLog out + exit_to_applogout
        @@ -81,7 +81,7 @@
        • -
          Authors
          +
          authors
        • @@ -110,14 +110,27 @@
        +
        +
        +
          +
        • +
          translatorsForThisLanguage - miscTranslationLanguage
          +
        • +
        • + miscTranslationAuthors +
        • +
        +
        +
        diff --git a/pages/absences.html b/pages/absences.html index adf957c..477ce88 100644 --- a/pages/absences.html +++ b/pages/absences.html @@ -20,6 +20,7 @@ + @@ -31,7 +32,7 @@