Code

Unified label screen#871

Code

Open

tyleryandt18 wants to merge 144 commits intoe-mission:single_tenant_app_snapshot_unmaintainede-mission/e-mission-phone:single_tenant_app_snapshot_unmaintainedfrom tyleryandt18:Unified-Label-Screentyleryandt18/e-mission-phone:Unified-Label-ScreenCopy head branch name to clipboard

+32,164-3,356

Commits

Commits on Oct 12, 2021

• init repo with ui changes and google forms after intro

  ervinanoh

  committed
  8e01490

  Copy full SHA for 8e01490

Commits on Oct 13, 2021

• updated form

  ervinanoh

  committed
  62471a3

  Copy full SHA for 62471a3

• set correct field to preset UUID

  ervinanoh

  committed
  d84375c

  Copy full SHA for d84375c

Commits on Oct 19, 2021

• set langage switcher

  ervinanoh

  committed
  83083e5

  Copy full SHA for 83083e5

• set up correctly langage switcher

  ervinanoh

  committed
  1ab8948

  Copy full SHA for 1ab8948

Commits on Nov 3, 2021

• place language selection first in options

  idillon-sfl

  committed
  4807519

  Copy full SHA for 4807519

• add memorization of selected language

  idillon-sfl

  committed
  75bdfe5

  Copy full SHA for 75bdfe5

• remove italian from language choices

  idillon-sfl

  committed
  5af5ff1

  Copy full SHA for 5af5ff1

• Change wrong names and text about heatmap mode for language selection

  idillon-sfl

  committed
  7892ff3

  Copy full SHA for 7892ff3

Commits on Nov 4, 2021

• translate modes and and purposes

  idillon-sfl

  committed
  a4b3c45

  Copy full SHA for a4b3c45

Commits on Nov 5, 2021

• fix list.html indentation and add comments

  idillon-sfl

  committed
  7d7068d

  Copy full SHA for 7d7068d

• update dashboard: center title, remove charts, remove sharing button

  idillon-sfl

  committed
  aceb00e

  Copy full SHA for aceb00e

• Update dashboard design: footprint is almost fine

  idillon-sfl

  committed
  6ffc204

  Copy full SHA for 6ffc204

• Update dashboard design: calories almost fine

  idillon-sfl

  committed
  9897fd5

  Copy full SHA for 9897fd5

Commits on Nov 8, 2021

• Place Footprint and Calories on same line

  idillon-sfl

  committed
  84dd4e2

  Copy full SHA for 84dd4e2

• dashboard-bottom has right shape and background color

  idillon-sfl

  committed
  dfd9508

  Copy full SHA for dfd9508

• Moving css specific to dashboard into separate css file

  idillon-sfl

  committed
  c748a3d

  Copy full SHA for c748a3d

Commits on Nov 9, 2021

• dashboard-bottom somewhat looks like what it should be

  idillon-sfl

  committed
  9db4dc2

  Copy full SHA for 9db4dc2

• update change data button style

  idillon-sfl

  committed
  09c5c3e

  Copy full SHA for 09c5c3e

• Remove non used tabs

  idillon-sfl

  committed
  a47daa8

  Copy full SHA for a47daa8

• Replace colors #01D0A7, #71bc98, #1b9e77, #33e0bb, #30A64A and #5eedce (green) for #1123CB (blue) everywhere

  idillon-sfl

  committed
  3189202

  Copy full SHA for 3189202

• Diary timeline has right colors

  idillon-sfl

  committed
  16e024f

  Copy full SHA for 16e024f

• Update diary card colors to white with blue border

  idillon-sfl

  committed
  1685f9a

  Copy full SHA for 1685f9a

• Remove every occurences of css box-shadow

  idillon-sfl

  committed
  b748acb

  Copy full SHA for b748acb

• Update the colors of the datepicker

  idillon-sfl

  committed
  914f54d

  Copy full SHA for 914f54d

• delete unused options

  idillon-sfl

  committed
  a8c8a8a

  Copy full SHA for a8c8a8a

Commits on Nov 10, 2021

• update toggle color to blue

  idillon-sfl

  committed
  6c90461

  Copy full SHA for 6c90461

• Update diary date to right color and border

  idillon-sfl

  committed
  bba1e6f

  Copy full SHA for bba1e6f

• update profile tab with required information

  idillon-sfl

  committed
  b652f7a

  Copy full SHA for b652f7a

• Fix ugly font

  idillon-sfl

  committed
  412508b

  Copy full SHA for 412508b

• Center vertically arrows and times on diary

  idillon-sfl

  committed
  c81474a

  Copy full SHA for c81474a

• Profile page is almost same as prototype

  idillon-sfl

  committed
  8307467

  Copy full SHA for 8307467

Commits on Nov 11, 2021

• fix mode and purpose selection in diary

  idillon-sfl

  committed
  a2942c8

  Copy full SHA for a2942c8

• center diary cards, place its content horizontally, change buttons

  idillon-sfl

  committed
  daae884

  Copy full SHA for daae884

Commits on Nov 12, 2021

• Fix diary map zoom

  idillon-sfl

  committed
  c586f0c

  Copy full SHA for c586f0c

• Add date range

  idillon-sfl

  committed
  a89f367

  Copy full SHA for a89f367

• Fix footprint and calories style

  idillon-sfl

  committed
  be85683

  Copy full SHA for be85683

• Fix diary space between infos. Change draft button, but still ugly

  idillon-sfl

  committed
  9fb208f

  Copy full SHA for 9fb208f

• Put dates directly on dashboard

  idillon-sfl

  committed
  0cfe93f

  Copy full SHA for 0cfe93f

Commits on Nov 15, 2021

• Fix titles style

  idillon-sfl

  committed
  50e91a6

  Copy full SHA for 50e91a6

• Update refresh button style

  idillon-sfl

  committed
  36e5a41

  Copy full SHA for 36e5a41

• Update nav bar colors

  idillon-sfl

  committed
  8345cc9

  Copy full SHA for 8345cc9

• Update draft button

  idillon-sfl

  committed
  3b6c354

  Copy full SHA for 3b6c354

• Update date-picker arrow icons

  idillon-sfl

  committed
  79f9ca2

  Copy full SHA for 79f9ca2

• Center dashboard-top properly

  idillon-sfl

  committed
  05abf1c

  Copy full SHA for 05abf1c

• Enlarge control option lines

  idillon-sfl

  committed
  b7e4b37

  Copy full SHA for b7e4b37

Commits on Nov 16, 2021

• Change survey and make startSurveyPrefilled more flexible

  idillon-sfl

  committed
  393a9b8

  Copy full SHA for 393a9b8

• Add forgotten icons

  idillon-sfl

  committed
  6ba8407

  Copy full SHA for 6ba8407

• Add missing angular-translate-storage-cookie and angular-translate-storage-local to bower file

  idillon-sfl

  committed
  b891100

  Copy full SHA for b891100

Commits on Nov 17, 2021

• Fix dashboard-top margins

  idillon-sfl

  committed
  5f6f5c7

  Copy full SHA for 5f6f5c7

• Display current language properly in profile

  idillon-sfl

  committed
  b98f1c3

  Copy full SHA for b98f1c3

• Login with generated token

  idillon-sfl

  committed
  4b93d92

  Copy full SHA for 4b93d92

• Update server address

  idillon-sfl

  committed
  e5a957a

  Copy full SHA for e5a957a

• Remove login page and comment out log out

  idillon-sfl

  committed
  4830abc

  Copy full SHA for 4830abc

• Comment out non-emplemented profile options

  idillon-sfl

  committed
  efb29ea

  Copy full SHA for efb29ea

• Remove splash screen's background image

  idillon-sfl

  committed
  97c0a61

  Copy full SHA for 97c0a61

• Change app name to com.fabmoqc.mamobilite. Update android-targetSdkVersion to 30. Deactivate Google Service.

  idillon-sfl

  committed
  48a92de

  Copy full SHA for 48a92de

Commits on Nov 18, 2021

• Update application name and author name

  idillon-sfl

  committed
  7458d9d

  Copy full SHA for 7458d9d

• Update logo

  idillon-sfl

  committed
  f3ed5d1

  Copy full SHA for f3ed5d1

• Update android-versionCode to 43

  idillon-sfl

  committed
  413c07d

  Copy full SHA for 413c07d

Commits on Nov 22, 2021

• Update logo

  idillon-sfl

  committed
  a00b603

  Copy full SHA for a00b603

• Update date format

  idillon-sfl

  committed
  a6b6c7d

  Copy full SHA for a6b6c7d

• Fix hidden last time in diary

  idillon-sfl

  committed
  bae10d8

  Copy full SHA for bae10d8

• Update dashboard to be adaptative with screen size

  idillon-sfl

  committed
  fd106de

  Copy full SHA for fd106de

• Add www/pro-manifest.json to gitignore

  idillon-sfl

  committed
  09be16b

  Copy full SHA for 09be16b

• Update to android version 44 and ios version 42

  idillon-sfl

  committed
  92ad9da

  Copy full SHA for 92ad9da

• Update android version to 45

  idillon-sfl

  committed
  2106fbb

  Copy full SHA for 2106fbb

Commits on Nov 23, 2021

• Update Android version code to 47

  idillon-sfl

  committed
  44f3406

  Copy full SHA for 44f3406

• Update modes and purposes

  idillon-sfl

  committed
  648e3b1

  Copy full SHA for 648e3b1

• Fix median speed label to average speed label

  idillon-sfl

  committed
  d032950

  Copy full SHA for d032950

• Use ionicActionSheet for mode and purpose selection

  idillon-sfl

  committed
  273358c

  Copy full SHA for 273358c

• Align options with title for ionicActionSheet

  idillon-sfl

  committed
  606b252

  Copy full SHA for 606b252

Commits on Nov 24, 2021

• Add 'Delete my data' and 'Leave a comment' buttons

  idillon-sfl

  committed
  6b8568c

  Copy full SHA for 6b8568c

• Remove downloading of translations

  idillon-sfl

  committed
  820a431

  Copy full SHA for 820a431

• Add french privacy policy

  idillon-sfl

  committed
  6c405e3

  Copy full SHA for 6c405e3

• Reduce 'View Privacy Policy' popover's size

  idillon-sfl

  committed
  a06b4c7

  Copy full SHA for a06b4c7

• Remove english text in consent-fr.html

  idillon-sfl

  committed
  1a2ed1d

  Copy full SHA for 1a2ed1d

• Decline button from intro gets user to previous page

  idillon-sfl

  committed
  ab8f1b4

  Copy full SHA for ab8f1b4

• Add small blue bar over icon of selected tab

  idillon-sfl

  committed
  c7b28e3

  Copy full SHA for c7b28e3

• Temporarily switch policy to french

  idillon-sfl

  committed
  2e3c44c

  Copy full SHA for 2e3c44c

• Update Android version to 48 and iOS version to 43

  idillon-sfl

  committed
  8af1682

  Copy full SHA for 8af1682

Commits on Nov 25, 2021

• Update policy and conditions

  idillon-sfl

  committed
  13524e0

  Copy full SHA for 13524e0

• Fix selected tab icon's color

  idillon-sfl

  committed
  f71ab2d

  Copy full SHA for f71ab2d

Commits on Nov 29, 2021

• Reintroduce 'Force sync', 'Download json dump' and 'Email logs'

  idillon-sfl

  committed
  ffc009a

  Copy full SHA for ffc009a

• Update Android version to 49 and iOS version to 44

  idillon-sfl

  committed
  416d5f5

  Copy full SHA for 416d5f5

Commits on Dec 7, 2021

• Fix e-car (drove alone) value

  idillon-sfl

  committed
  980ea8b

  Copy full SHA for 980ea8b

Commits on Dec 8, 2021

• Set android-versionCode to 50 and io-CFBundleVersion to 45

  idillon-sfl

  committed
  d4d83b5

  Copy full SHA for d4d83b5

• Add english survey

  idillon-sfl

  committed
  fde4059

  Copy full SHA for fde4059

Commits on Dec 9, 2021

• Translate some modes that were not translated

  idillon-sfl

  committed
  b9416a3

  Copy full SHA for b9416a3

• Translate consent-text into english

  idillon-sfl

  committed
  9b7b02d

  Copy full SHA for 9b7b02d

• Remove 'Download json dump', 'Force sync' and 'Email log' from profile

  idillon-sfl

  committed
  8957b5c

  Copy full SHA for 8957b5c

• Remove summary page and explain page from intro

  idillon-sfl

  committed
  9053550

  Copy full SHA for 9053550

Commits on Dec 14, 2021

• Update android-versionCode to 51, ios-CFBundleVersion to 46, version to 3.0.1

  idillon-sfl

  committed
  c7ced01

  Copy full SHA for c7ced01

• Fix field id for user id in english survey

  idillon-sfl

  committed
  7ec6a06

  Copy full SHA for 7ec6a06

• Update android-versionCode to 52, ios-CFBundleVersion to 47

  idillon-sfl

  committed
  7341dec

  Copy full SHA for 7341dec

Commits on Jan 17, 2022

• Put back 'Download json dump', 'Force sync' and 'Email log' into profile

  idillon-sfl

  committed
  1232b45

  Copy full SHA for 1232b45

• Update android-versionCode to 53, ios-CFBundleVersion to 48

  idillon-sfl

  committed
  8e16935

  Copy full SHA for 8e16935

• Fix app identifier

  idillon-sfl

  committed
  847f7ac

  Copy full SHA for 847f7ac

Commits on Mar 18, 2022

• Update google-services.json

  lgharib

  authored
  7c85264

  Copy full SHA for 7c85264

• Merge pull request e-mission#1 from FabmobQC/Dev-Task-6080-Added_firebase_google_service

  Show description for e4ded72
  lgharib

  authored
  e4ded72

  Copy full SHA for e4ded72

• Update GoogleService-Info.plist

  lgharib

  authored
  302ee96

  Copy full SHA for 302ee96

• Merge pull request e-mission#2 from FabmobQC/Dev-Task-6080-Added_firebase_Google_Service_Info_plist

  Show description for e4a61aa
  lgharib

  authored
  e4a61aa

  Copy full SHA for e4a61aa

Commits on Mar 21, 2022

• Update android version to 54 and ios version to 49

  idillon-sfl

  committed
  f6721a7

  Copy full SHA for f6721a7

• Merge branch 'Dev' of github.com:FabmobQC/mamobilite into Dev

  idillon-sfl

  committed
  0415179

  Copy full SHA for 0415179

Commits on Mar 22, 2022

• Update google-services.json

  lgharib

  authored
  ec628ab

  Copy full SHA for ec628ab

• Update GoogleService-Info.plist

  lgharib

  authored
  b8b33bd

  Copy full SHA for b8b33bd

• Merge pull request e-mission#3 from FabmobQC/Dev-Task-6080-Fixe_bundle_name

  Show description for 7483320
  lgharib

  authored
  7483320

  Copy full SHA for 7483320

• Update android version to 55

  idillon-sfl

  committed
  37415a4

  Copy full SHA for 37415a4

• Update config.cordovabuild.xml

  lgharib

  authored
  96601b5

  Copy full SHA for 96601b5

• Update google-services.json

  lgharib

  authored
  960e43d

  Copy full SHA for 960e43d

• Update GoogleService-Info.plist

  lgharib

  authored
  98d4602

  Copy full SHA for 98d4602

• Merge pull request e-mission#4 from FabmobQC/Dev-Task-6080-Fix_firebase_configuration

  Show description for b29495e
  lgharib

  authored
  b29495e

  Copy full SHA for b29495e

• Increment android version to 56

  idillon-sfl

  committed
  9205933

  Copy full SHA for 9205933

• Disable button to activate or deactivate tracking

  idillon-sfl

  committed
  fa6d5a0

  Copy full SHA for fa6d5a0

• Increment version to 3.0.2 and android version to 57

  idillon-sfl

  committed
  af87ed2

  Copy full SHA for af87ed2

• Comment out code that overwrite GoogleService

  idillon-sfl

  committed
  f91679b

  Copy full SHA for f91679b

• Hardcode version into profile tab

  idillon-sfl

  committed
  0b2f511

  Copy full SHA for 0b2f511

• Increment android version to 58

  idillon-sfl

  committed
  3e6d151

  Copy full SHA for 3e6d151

• Uncomment pushnotification. Increment android version to 59

  idillon-sfl

  committed
  d87ed72

  Copy full SHA for d87ed72

Commits on Apr 8, 2022

• Updated notification application to register device_token

  lgharib

  committed
  0461865

  Copy full SHA for 0461865

• Update to version 3.0.3

  lgharib

  committed
  c6c0b31

  Copy full SHA for c6c0b31

• Update website forms links

  lgharib

  committed
  316a58b

  Copy full SHA for 316a58b

Commits on Apr 13, 2022

• Added copy identifier to clipboard

  lgharib

  committed
  a9d28a0

  Copy full SHA for a9d28a0

• Muted post trip notifications

  lgharib

  committed
  2f27339

  Copy full SHA for 2f27339

Commits on Apr 15, 2022

• cleaned setup android native scrip

  lgharib

  committed
  c4fefb7

  Copy full SHA for c4fefb7

Commits on Apr 20, 2022

• migrated app to latest version and added permissions screen

  lgharib

  committed
  0c2eb94

  Copy full SHA for 0c2eb94

• Added permissions translations

  lgharib

  committed
  ef1e58e

  Copy full SHA for ef1e58e

• upgrade to version 3.0.4

  lgharib

  committed
  2e61d38

  Copy full SHA for 2e61d38

Commits on Apr 21, 2022

• Merge pull request e-mission#5 from FabmobQC/Dev-migrate-to-latest-everything

  Show description for 20be8ea
  

  larbizard

  authored and

  lgharib

  committed
  20be8ea

  Copy full SHA for 20be8ea

Commits on Apr 25, 2022

• removed post trip prompt

  lgharib

  committed
  f0f4309

  Copy full SHA for f0f4309

• updated term of use and policy

  lgharib

  committed
  f06412a

  Copy full SHA for f06412a

Commits on Apr 26, 2022

• updated to version 3.0.5

  lgharib

  committed
  7432aec

  Copy full SHA for 7432aec

Commits on Apr 29, 2022

• update googleservice-info.plist

  lgharib

  committed
  a795b26

  Copy full SHA for a795b26

Commits on Jul 7, 2022

• New InfiniteScrollTripItem Directive, Issue e-mission#740

  Show description for 643bd2e
  tyleryandt18

  committed
  643bd2e

  Copy full SHA for 643bd2e

Commits on Jul 8, 2022

• Diary Item Directive

  Show description for 1abf352
  tyleryandt18

  committed
  1abf352

  Copy full SHA for 1abf352

Commits on Aug 5, 2022

• Unified Diary Screen

  Show description for f4ac44a
  tyleryandt18

  committed
  f4ac44a

  Copy full SHA for f4ac44a

Commits on Aug 6, 2022

• Added Date Selector Functions and Templates

  Show description for 2d62b7a
  tyleryandt18

  committed
  2d62b7a

  Copy full SHA for 2d62b7a

Commits on Aug 7, 2022

• Merge branch 'Dev' of https://github.com/FabmobQC/mamobilite into Unified-Label-Screen

  tyleryandt18

  committed
  80dbb53

  Copy full SHA for 80dbb53

• Merge branch 'Unified-Diary-Screen' of https://github.com/tyleryandt18/e-mission-phone into Unified-Label-Screen

  tyleryandt18

  committed
  8d9c72a

  Copy full SHA for 8d9c72a

Commits on Aug 10, 2022

• Requested Changes

  tyleryandt18

  committed
  67817be

  Copy full SHA for 67817be

• Changing Color Schematic

  Show description for 6a9f4cc
  tyleryandt18

  committed
  6a9f4cc

  Copy full SHA for 6a9f4cc

Commits on Aug 11, 2022

• Added Comments

  tyleryandt18

  committed
  0925801

  Copy full SHA for 0925801

• Merge branch 'Unified-Diary-Screen' of https://github.com/tyleryandt18/e-mission-phone into Unified-Label-Screen

  tyleryandt18

  committed
  96715b3

  Copy full SHA for 96715b3

• Unified Diary/Label Screen with Commit History

  Show description for e14b80f
  tyleryandt18

  committed
  e14b80f

  Copy full SHA for e14b80f