github.com/criticalmaps/criticalmaps-ios commits

Merge branch 'master' into changing-id

# Conflicts:
# CHANGELOG.md
# CriticalMaps.xcodeproj/project.pbxproj

8fe50bf5a4110ee85c0cb4a705ba37ed0a3691bd authored over 5 years ago

Merge branch 'master' into NetworkActivityIndicator

# Conflicts:
# CHANGELOG.md
# CriticalMaps.xcodeproj/project.pbxproj

b833bb4dc49ac9cdff9c374099eee06d74f8d325 authored over 5 years ago

typo

884bb8d00f1ccf425699e49a4295db758a23acc8 authored over 5 years ago

update indicator visibility on main thread

9f674a6ce1d73b615e0475bd27f77015f952ff9a authored over 5 years ago

Merge pull request #90 from lennet/frenchLoalizables

Added French localization configuration

93aec8753f6ea076de117620342f84948aefa2c1 authored over 5 years ago

updated changelog

562eb09bcd4d5674488caf8693dd46c3611024fe authored over 5 years ago

fixed tests

9e6ce6e0875cbdfdf19cba2fae63022a4ba7eec0 authored over 5 years ago

deleted more code and added tests

75c8d802fd55e8d1b3d23cfd54bef5e4a20ea3bb authored over 5 years ago

updated changelog

5968fae1e722917beb7dadf3411ca3c7b6105fd9 authored over 5 years ago

Merge branch 'master' into frenchLoalizables

# Conflicts:
# CriticalMass/fr.lproj/Localizable.strings

adbaa7ad91f770b97586e845f747de0e5523d976 authored over 5 years ago

Added french to the project

9722036cdd8739e1c55e11ef9434d1b507c5589d authored over 5 years ago

Merge pull request #87 from AlbanSagouis/master

Translation of Localizable.strings in French

2733f232cb516ae71ba8226f40d447fb434bf1ce authored over 5 years ago

renamed method

489ab84eca6b04cc2c4f52888919806568c40a14 authored over 5 years ago

moved ActivityIndicator logic to the network layer

ac34f1d78d48e296c245a2321c6150d2eaf841fb authored over 5 years ago

1 typo + missing translation

ee51d3c8961330da4ebee396a836ed416ac113ab authored over 5 years ago

Translation of Localizable.strings in French

2b0fc75964cf1dc44ebae1800e3573e97d473f35 authored over 5 years ago

first follow friends prototype

335196c0b992d3f9956cb9f9fb2632224cf5acf3 authored over 5 years ago

added missing completion handler

be8ce2340db922e9dc3522eb985e7076b0a3fdd8 authored over 5 years ago

fixed typo

f66ed719c03f202b61dfd228afb1243a5ca960fd authored over 5 years ago

updated changelog

5790ece97255cd24db721cdc228dc6a74f5c66e1 authored over 5 years ago

remove hasActiveRequest from RequestManager

a4ea33b4085bd26070eb51cfbcca8e84243dab9f authored over 5 years ago

fixed test

a1d16db185c4361423eb3e2e72e09ce01509d314 authored over 5 years ago

Added backgroundTaskIdentifier for sending Chat messages

30722442b28aa23e0f006e4b9bffc3085ddf411b authored over 5 years ago

added Network activity indicator support

ff4c2b10a768afae484640131ca1c0046c9d50ac authored over 5 years ago

Merge pull request #64 from lennet/swiftformat

Added Swiftformat to the project

8dfa0f2d26d4c3d0bd90f1e7aa6f2aef083a5e62 authored almost 6 years ago

swiftformat .

727ad8bdc9c35fdd8d01e004594e914fdc192ae0 authored almost 6 years ago

Merge branch 'master' into swiftformat

aa529e42b93d3975962e9dba269a1e5e518a6ac3 authored almost 6 years ago

Empty chat input fix (#82)

* disable send button when textfield isEmpty
* update CHANGELOG

a1eeab9b15b09cf494dde9046a09a1865b149259 authored almost 6 years ago

updated changelog

e07c5d507b9636be24eb3e8053ad9e3517648969 authored almost 6 years ago

Merge branch 'master' into swiftformat

# Conflicts:
# CriticalMaps.xcodeproj/project.pbxproj
# CriticalMass/RoundableImageView.swift
# ...

316159e6c42f22b01d3837f20ec073e04ed85772 authored almost 6 years ago

Merge pull request #71 from lennet/chatbubble

Unread Messages Bubble

10b034d921e72217e6e07d1ab0dc1e2593e902e1 authored almost 6 years ago

updated changelog

02f50dbf168ed1eb008313e245531c565128e83c authored almost 6 years ago

Merge branch 'master' into chatbubble

1c05edfbf116d3fed5fade1b8393cc373af681a7 authored almost 6 years ago

v3.0.0

7b9808f5b767cdc786c941e8537d392ebd80e63a authored almost 6 years ago

Merge pull request #70 from lennet/message-decoding

Fixed decoding Android Messages

a07c26dbfd34e49f5acd0efd653ff8f2f9c40aeb authored almost 6 years ago

Update README.md (#79)

ac2562214a7cee0ac271081749f51f20aaab0ed3 authored almost 6 years ago

Merge pull request #77 from lennet/fix-74

fix icon state when leaving following mode

2f6c639dc02b381d6d37c6324721ae03e0980e59 authored almost 6 years ago

Merge pull request #78 from lennet/fix-76

Fixed deprecation warning

b00d867a9fc9091d1ce98ffa81945f67bdcf09e4 authored almost 6 years ago

fixed deprecation warning

bbf8f6911683ed729daec0d0820a16837d505de6 authored almost 6 years ago

update button for all state changes

423b88cea7cdd00222e0d3315824106581a8059e authored almost 6 years ago

improved badge position

58434a36b59075d82a126bc2856f574c2d32e9b9 authored almost 6 years ago

added ChatNavigationButtonController

3475149cf5d4d10c0c22173cfd126e7c6d9709e6 authored almost 6 years ago

Prepare release candidate (#68)

* set ITSAppUsesNonExemptEncryption=NO for testflight

* increase build number

041c0a00e5c566973bc6ac091b189dd1b3265cb8 authored almost 6 years ago

reverted colors changes

c388daa10d5d9224d3085aa08ba86f315755d2af authored almost 6 years ago

added. connection between chatmanager & UI

1051585341198127f615165880598b072910af62 authored almost 6 years ago

added unread messages logic

dfd660bb226baf9722ade010c34f7e6732970ff4 authored almost 6 years ago

Merge branch 'master' into chatbubble

265efe10c1436a5712ae28110fda99053841d438 authored almost 6 years ago

refactored NavigationOverlayItem

7100fd75f44c0eacd1317fdadf950ea33cbee62f authored almost 6 years ago

Added ChatNavigationButton

679932db223399cd3434d988493cff01d95cc435 authored almost 6 years ago

added url decoding

dadf9f51f9be5cb8981a1adb4fe339dcf1215f66 authored almost 6 years ago

Merge pull request #66 from mltbnz/twitterCellLayoutFix

Twitter cell layout fix

3a2c03813af334b0a78cf3355b25db41c2271e54 authored almost 6 years ago

inset tableView seperator in tweetController

8e0af5ede9185c374b47b0134c5b8e5a7a2d14ed authored almost 6 years ago

* add lineHeight to tweetTextView

* update constraints to align better with Design

5a6db969db2899d64cdc98b18f5068a123315afa authored almost 6 years ago

Update README.md

cc6479b71edd60319a76fdb199caded6c3490494 authored almost 6 years ago

Update CHANGELOG.md

1a46a6e9608ddb3446645ae011a441212ca6d0dd authored almost 6 years ago

* move dateformatting out of UIView

* add formatting code in FormatDisplay

7c5f6de839c42d20a358b1fe72a11771017da93b authored almost 6 years ago

* add textContainerInset for textView

* remove setting colors from class
* add setting colors, fonts and all other UI related things in...

6c81a8b3d191f4c183d32074ea2f772afbddd2ed authored almost 6 years ago

Merge pull request #63 from lennet/fix-tests

[WIP] Fix tests

a01695114b44ab9b2390bb29500ba2d6fb742b14 authored almost 6 years ago

Merge pull request #65 from lennet/fix-ios-10-dynamic-rowheights

Fixed row heights for Rules & Settings on iOS 10

1778e4d59788493a8c4f40d1f3f1df63e3ca3fdd authored almost 6 years ago

Merge branch 'master' into fix-ios-10-dynamic-rowheights

f623b62b590ec5bbf9fdd2a8d3bd68f99ca0801b authored almost 6 years ago

improved postlocation tests

520cd5169a64383935476ff6b6c76e25bdba8a80 authored almost 6 years ago

set wait back to 1

c87eb3234aa54638e957fa7c74e41aa7e2e5e6cd authored almost 6 years ago

increased wait timeouts

db0bb1f438e9191765b87f258d1b71af8fcb8766 authored almost 6 years ago

reverted synchronisation and decreased timer

f440c0a1d28cbc8542ae8f796a91b5a808619a45 authored almost 6 years ago

synchronized tests

a4d02b5e1eb4a33dd3a9264ed94f47c3d9b1de08 authored almost 6 years ago

Merge pull request #62 from mltbnz/settings

Add Version and Buildnumber to Settings and acknoledgements to system settings

8e55cea4340f1599c01cacd50e931c2b10ec8386 authored almost 6 years ago

fixed row heights for Rules & Settings on iOS 10

9ec0bfcd75ee433a2f8e2b813591618bb808f0ba authored almost 6 years ago

run swiftformat.

310a9cf24ddac17e3dbfef8eeca80038f0bf7efa authored almost 6 years ago

add height check to not set view every layout cycle

22e7d51f93a4bea36682cc4569030faf6456c0b1 authored almost 6 years ago

* move footer resize into UITableViewController extension and remove

* not setting footerview again since it is also working without setting the view again

600893c01aa47646243ac22ac89ebaf1bbeb0751 authored almost 6 years ago

added swift-version file

e05dd3efdc4db0b0e3ad0de6628f7815f1f7f666 authored almost 6 years ago

Added swiftformat to the project

dec498986764ad25f1a1784c72c5ef097094c005 authored almost 6 years ago

update to use shorter version 👌

108c73013a5091cd19792690c973294e33aec0c0 authored almost 6 years ago

swiftformat

92db9984431b0956bff2783b27021778c97c406e authored almost 6 years ago

replaced Timer with DispatchQueue

5022cd132f5b8f5f67b0074d6d4fe001f3b18017 authored almost 6 years ago

update Podfile & Gemfile.lock

a2a8ac7a1ad6ef752a3ab22b0508c0825d1bbc2b authored almost 6 years ago

remove alpha channel of appicons (#61)

b0ea1f851fb806a00797c11eac0765fec509a430 authored almost 6 years ago

removes explicit build version from system settings

68f2d16e05b8cd2f73617dbe70a2855a1289c29c authored almost 6 years ago

fix colors

b55f7d06b34e3cbe0a9dd00d53ec746347ef072f authored almost 6 years ago

Merge with upstream

8a43e45fe3e2c651089f0fbc49a0a279fabab688 authored almost 6 years ago

Merge pull request #56 from mltbnz/master

iOS Deployment target

a6d55a9ebfcea9514d1752defb6060f4b185ec86 authored almost 6 years ago

Merge branch 'settings' of github.com:mltbnz/criticalmaps-ios into settings

3e9a86a4a7868974f0b15410327e5d0cae95d128 authored almost 6 years ago

add 3rd lib txt

a328fbd6e8f27138ec9c07d21757860d587089d1 authored almost 6 years ago

updates wording

68227789267f022674b38fedf139c6637142eaad authored almost 6 years ago

updates openURL to iOS 10 + syntax

ab2041428d55ec6da1f342a032d6fb6a37669eae authored almost 6 years ago

CM Logo

adds CM logo to display in app settings

2c65778d044ff333815fc5075baf84ab172e5ab4 authored almost 6 years ago

Build phase scripts

* adds Generate Licenses build phase
* adds build phase to set build number and version number i...

a9442edd0820c51acd29cea3e6256b68adf1af64 authored almost 6 years ago

update colors

2671fe96d644a4586fa4ad26216fb126a555be5b authored almost 6 years ago

add license plist builder

adds license builder as binary from https://github.com/mono0926/LicensePlist

2ef15d18fbbe3da674246d51c317a2c31651f6aa authored almost 6 years ago

Settings.bundle

* adds Settings.bundle to project
* adds initialy generated LicensePList from mono0926

d22d982ddbd019699e1138f007d33603d260da87 authored almost 6 years ago

Settings Footer View

* adds CM footer to settings
* adds hasInnerShadow property to CircularImageView
* sets footer i...

40abdb1e764178e77df7fb96ed6b417f7c1231f2 authored almost 6 years ago

Merge pull request #59 from lennet/fix-58

Fixed missing location data on launch

246017879c1d39d224905b73e9f87426d06970a6 authored almost 6 years ago

Merge pull request #60 from lennet/Swift-5

Swift 5 Migration

2ea58cc438b299c2d3cbe0a307d724ce6e413478 authored almost 6 years ago

update Podfile

15d0dc1d5cf56e40d2c79d0f942f895bdea2d2e7 authored almost 6 years ago

updated travis image to 10.2

4d111264a98d3bfc2aedcd6e2b58ba1fd4a8c98c authored almost 6 years ago

fixed warnings

e18498b160cdf330d239848274fc932bf5fceb1b authored almost 6 years ago

updated to Swift-5 and fixed some project warnings

07abfce7704ba9d992813ad53a78f54537e95156 authored almost 6 years ago

fixed tests

a951da0309dd962ce32cefa0fbd4059363391ae3 authored almost 6 years ago

load data on launch

bf3c778dccf7d5159a9101453a096e5a1b1750a2 authored almost 6 years ago

fixed missing locations on app launch

a858c8f2b778d0bdf013de9a999bafab12c6251e authored almost 6 years ago

Ecosyste.ms: OpenCollective

github.com/criticalmaps/criticalmaps-ios