1. 18 Apr, 2020 1 commit
  2. 17 Apr, 2020 3 commits
  3. 15 Apr, 2020 5 commits
  4. 14 Apr, 2020 1 commit
  5. 13 Apr, 2020 1 commit
  6. 09 Apr, 2020 5 commits
  7. 08 Apr, 2020 2 commits
  8. 07 Apr, 2020 2 commits
  9. 06 Apr, 2020 3 commits
  10. 04 Apr, 2020 6 commits
  11. 03 Apr, 2020 11 commits
    • wieseoli's avatar
      add roundedCorners · 05763bee
      wieseoli authored
      05763bee
    • wieseoli's avatar
      Merge branch 'dev' · 98d14226
      wieseoli authored
      Conflicts:
      	enzevalos_iphone.xcodeproj/project.pbxproj
      	enzevalos_iphone.xcodeproj/project.pbxproj.orig
      	enzevalos_iphone/AppDelegate.swift
      	enzevalos_iphone/AuthenticationModel.swift
      	enzevalos_iphone/AuthenticationScreen.swift
      	enzevalos_iphone/AuthenticationViewModel.swift
      	enzevalos_iphone/Base.lproj/Main.storyboard
      	enzevalos_iphone/CHelpers.swift
      	enzevalos_iphone/Certificate.swift
      	enzevalos_iphone/MailAccount.swift
      	enzevalos_iphone/SMIME.swift
      	enzevalos_iphone/SMIMEHelpers.swift
      	enzevalos_iphone/SearchHelper.swift
      	enzevalos_iphone/Settings.bundle/Acknowledgements.plist
      	enzevalos_iphone/SwiftUI/Inbox/Inbox.swift
      	enzevalos_iphone/SwiftUI/SupportingViews/MailView.swift
      	enzevalos_iphone/SwiftUI/SupportingViews/SearchView.swift
      	enzevalos_iphone/c/certificate-helpers.c
      	enzevalos_iphone/c/certificate-helpers.h
      	enzevalos_iphone/c/general-helpers.c
      	enzevalos_iphone/c/generic-helpers.h
      	enzevalos_iphone/c/smime-helpers.c
      	enzevalos_iphone/c/smime-helpers.h
      	enzevalos_iphone/de.lproj/Localizable.strings
      	enzevalos_iphone/en.lproj/Localizable.strings
      	enzevalos_iphoneTests/GeneratedMocks.swift
      98d14226
    • wieseoli's avatar
      Merge branch 'onboardingScreens_swiftUI_merge_Dev' into 'dev' · eb9f2fed
      wieseoli authored
      Onboarding screens swift ui merge dev
      
      See merge request !59
      eb9f2fed
    • wieseoli's avatar
      remove cycle bug · 7b34ea1b
      wieseoli authored
      7b34ea1b
    • wieseoli's avatar
      fix contactview -> badge case bug · caa7b7c0
      wieseoli authored
      But inbox is buggy
      caa7b7c0
    • wieseoli's avatar
      Merge branch 'dev' · 0272cb6c
      wieseoli authored
      Conflicts:
      	enzevalos_iphone.xcodeproj/project.pbxproj
      	enzevalos_iphone.xcodeproj/xcshareddata/xcschemes/enzevalos_iphone.xcscheme
      	enzevalos_iphone/Base.lproj/Main.storyboard
      	enzevalos_iphone/ContactViewController.swift
      	enzevalos_iphone/SwiftUI/Inbox/Inbox.swift
      	enzevalos_iphoneTests/GeneratedMocks.swift
      0272cb6c
    • wieseoli's avatar
      Merge branch '155-ui-for-gamifcation-stats' into 'dev' · b631329b
      wieseoli authored
      Create badge case screen
      
      See merge request !56
      b631329b
    • wieseoli's avatar
      9c22f8a5
    • wieseoli's avatar
      fix error · 6c07b4ce
      wieseoli authored
      6c07b4ce
    • wieseoli's avatar
      Merge branch 'dev' · 5e6fac22
      wieseoli authored
      Conflicts:
      	enzevalos_iphone.xcodeproj/project.pbxproj
      	enzevalos_iphoneTests/GeneratedMocks.swift
      5e6fac22
    • wieseoli's avatar
      localize strings · 78020e1a
      wieseoli authored
      78020e1a