github.com/TUM-Dev/Campus-iOS commits | Ecosyste.ms: OpenCollective

Remove unneeded loops in StudyRoomManager

22d659f31f35f370b26c68921ca410813dfd19f9 authored almost 8 years ago

Merge branch 'master' into max/contributing-instructions

e6ca9d1570605a23c3cb0d434c76d59f80f11a25 authored almost 8 years ago

Some more syntax finetuning

c6a9163abd7e97805f50790e128e5143d366a34d authored almost 8 years ago

Merge pull request #80 from TCA-Team/max/fix/not-yet-implemented

Add a “Not Yet Implemented” alert

21e55dd1e153625370816437251f4e96e427feb9 authored almost 8 years ago

Add contributing guidelines

This moves the current contributing guidelines from the README.md to CONTRIBUTING.md and adds som...

1d54c12d9cfe20705365ad3b0c4e336610ec0c3d authored almost 8 years ago

Add a “Not Yet Implemented” alert

Affected: More view: MVV, Services, Default Campus
Related #70

d985130fb0c5c88648ea58fec786ad9124235535 authored almost 8 years ago

Add layout constraints

68a5aabee6a492b29bfe74009e7a47b69d12e5f4 authored almost 8 years ago

Use correct casing in the style constants

74afdf338b9f874bec33b15e8545122913ea319b authored almost 8 years ago

Map StudyRoom.init instead of using removeAll()

2f46b7bcd39a867513f6f818c1cd7eceeabf4259 authored almost 8 years ago

Delete fastlane/Deliverfile

since it is personal and doesn’t contain any meaningful settings (yet)

6871dc51772f5dae59d43751cc9c30ec65411083 authored almost 8 years ago

Revert "regex now also matches mensa letter codes with up to 3 letter (important for GQB)"

This reverts commit 222c1882fed8e872ac9a1ed050788edb1a25874a.

86e6db3822317e7a025fa95161a0225dae974348 authored almost 8 years ago

Fixed all the constraints

630b74463ce4680a6e44c7fc3d4f5c37e0a3981b authored almost 8 years ago

Fixed all the constraints

f46ecf6998c3e810f38804b78607c8149c3d0683 authored almost 8 years ago

Merge branch 'master' into feature/24-study-rooms

6a61171b5d29e966dd9b5ca4fa1037ade78d6dc7 authored almost 8 years ago

regex now also matches mensa letter codes with up to 3 letter (important for GQB)

222c1882fed8e872ac9a1ed050788edb1a25874a authored almost 8 years ago

Merge pull request #77 from TG908/mensa_imporvements

Mensa improvements

73535e88410bf17d363485d9a140922e21c396e1 authored almost 8 years ago

Merge branch 'master' into mensa_imporvements

ad7fe3beb95583ab809e8805f241bd968f67bb60 authored almost 8 years ago

Merge pull request #75 from TG908/spinner_fix

Spinner fix

90c95204b54ded2488bde5838fbee028680b32f3 authored almost 8 years ago

trailing closure

61a1c5228e0b62084823c18b3a7fbc5bd6fd862a authored almost 8 years ago

Number formatter now uses Double instead of NSNumber

e5862a2e3db31a654d8448c09e1cecde37dd516a authored almost 8 years ago

Refactored price struct

1c222d6887ca955d8192d5e11ee25d4059da0669 authored almost 8 years ago

Fixed dictionaries

9daa5fa1b375e5607df279003010a369133cb1e8 authored almost 8 years ago

-Added nameWithEmojiWithoutAnnotations

-Cafeteria UI Changes

e24fe2888659bc85bc32e9c02e23685dd4d43ae3 authored almost 8 years ago

MenuTableViewCell added annotations

939291279bf9b076163057519db15771a1c10fa4 authored almost 8 years ago

Added Details to CafeteriaMenu containing: name, nameWithoutAnnotation, annotations and annotationDescriptions

f6bb4636c53e2b1687c8d76db76c92e2ec0f52d9 authored almost 8 years ago

NumberFormatter

f567f267fe6eb41691dcce96ae9bee0750c5d3c4 authored almost 8 years ago

Price Label

3f1b19c6415bd1b726e58e5ffe8ac1b208deebf8 authored almost 8 years ago

Added Price property

fa74ebd24fa85e14f2dd95091e4aa9ca12f9a792 authored almost 8 years ago

Added Price struct

b4557479068dd668d6b628b90f40daa7385b2a78 authored almost 8 years ago

-The names in the menu are now parsed and the letter codes for the food type are replaced with emoji

-Also the price is determined from a list of prices

1f051332739e2968f469a54d405f8361d208594f authored almost 8 years ago

Build Settings

372704d269d042155bb5911efa625b7038a3b4d8 authored almost 8 years ago

Build Settings

3a219fdeea8defef5eb18bf17c1f27b6f4e9ce83 authored almost 8 years ago

Build Settings

d96b80653000bc342cb07029618c0d64f8d1bc0d authored almost 8 years ago

Updated Pods

8999b4f4d6ea3bab86a4a499d8b8ad93aa8a7cbd authored almost 8 years ago

Merge branch 'master' into spinner_fix

1c65f7c74dcaa1836daccadddb11258764bc05d1 authored almost 8 years ago

Updated Pods

2f08581e480ac573ded8671f21e7d015319b1a75 authored almost 8 years ago

Update project.pbxproj

build settings...

631599cd576d5c8fe869218148487c3bc35c8b3b authored almost 8 years ago

Merge remote-tracking branch 'origin/tableView_fix' into spinner_fix

5a186002a43d6de83d7cd069dca5f940e2aa203c authored almost 8 years ago

Update CardViewController.swift

41f5030cf48dd3aadf0603e444e888c60336dacf authored almost 8 years ago

Revert "Revert "Merge remote-tracking branch 'origin/spinner_fix' into tableView_fix""

This reverts commit ce6f99b4635115cf8d6ef4d9893edc08e9a1daa7.

9bb481cf95bab5622faf3aabad5f6a7d4c041581 authored almost 8 years ago

Revert "Merge branch 'master' into spinner_fix"

This reverts commit 2d1058b280d282c564072abbf626731fc257d9d8, reversing
changes made to 4a96305c...

cdc9d6ff7ddf7329f7d3fd313717b6449e19a75e authored almost 8 years ago

Merge branch 'master' into spinner_fix

0b17b23dc32d863618881edac473fe2a5cbfc0e6 authored almost 8 years ago

Merge branch 'master' into tableView_fix

52abf69142f226b54573df1ca2c33fd55ad1c82e authored almost 8 years ago

Update project.pbxproj

Fixed Build Settings

f67cb630ca18329b693d9e2d354df540ef848288 authored almost 8 years ago

Merge remote-tracking branch 'origin/spinner_fix' into tableView_fix

3f21b78c1bae2374292ac438ec53aab99722a792 authored almost 8 years ago

Revert "Merge remote-tracking branch 'origin/spinner_fix' into tableView_fix"

This reverts commit 8a2c47592fde41b4e18b5a4d936039020bdb258e, reversing
changes made to 0032df8f...

ce6f99b4635115cf8d6ef4d9893edc08e9a1daa7 authored almost 8 years ago

Merge branch 'master' into spinner_fix

2d1058b280d282c564072abbf626731fc257d9d8 authored almost 8 years ago

Merge branch 'master' into tableView_fix

0e2e5f802b636a712bf19e6bbabb05bc401e35b8 authored almost 8 years ago

Merge remote-tracking branch 'origin/spinner_fix' into tableView_fix

8a2c47592fde41b4e18b5a4d936039020bdb258e authored almost 8 years ago

Updated Sweeft

923a8e3b1322018770472f2c292df019b6f65844 authored almost 8 years ago

Updated Sweeft

1db536c31289f728f229dd53d26243cc3d2001f6 authored almost 8 years ago

Implemented check for number of cards when refreshing.

4a96305c05da23178cbb895f374b187568a99684 authored almost 8 years ago

Fixed white borders around cells

0032df8fae699373322b2c0f0d3bfc1f309ad19c authored almost 8 years ago

Removed table view separator

40c951b5bcde9c31efa1db1ac03c99b90aba00b5 authored almost 8 years ago

Replaced deprecated M_PI with Double.pi

a8af05ca8970515f80e010e4495b11207e757a43 authored almost 8 years ago

Updated Sweeft

d66d9d267de8940de686d151fc21cd097fd0af5f authored almost 8 years ago

Probably fix the build

Don’t know why, but the run configurations have not been properly set for the testing targets

a7c78d1d57824ecc4553ddb87c9e20b2113fdf7a authored almost 8 years ago

Pods update and maybe some parts of the master merge

30b61bba3d0543a7df987b7d625dd314803b0d34 authored almost 8 years ago

Remove building, some design changes

28b0ee8aaf7c05608fd64eb7d6d712ebc58f0dde authored almost 8 years ago

Fix merge conflict in More.storyboard

69c27b2078a44ecdeb0278a56b27b069e1f70332 authored almost 8 years ago

Merge branch 'master' into feature/24-study-rooms

# Conflicts:
# TUM Campus App.xcodeproj/project.pbxproj
# TUM Campus App/More.storyboard
# TUM C...

9a2ed87a48d7898a7c413bfd60ee46eda537f106 authored almost 8 years ago

Move occupied indicator color to the status

45d444e5729627dfdd60ff6645f3bfa1fc193f9d authored almost 8 years ago

Merge pull request #66 from TCA-Team/sandra/65-crash-plus-bugfix

updated info.plist for contact access

b4f4ba70292622b96b45f2f9be6b6f31d1e2a1e4 authored almost 8 years ago

updated info.plist for contact access

25c6925a08d9c1806fe371f28adef4780427e1cd authored almost 8 years ago

Merge pull request #62 from TCA-Team/first-build-and-fastlane-deliver

State of the first build on iTunes

0633eed77c89c678b6c83c65fb06c33669ceae45 authored almost 8 years ago

Add instructions for snapshot and deliver to README

b8962bb784a7421373b2dd2b0eaedadbca354ff2 authored almost 8 years ago

Updated description and fixed snapshot

69f0b715bcd9211611265370c6682ce2488d6908 authored almost 8 years ago

Merge branch 'master' into first-build-and-fastlane-deliver

49565be68152a5358398a9323df7735685c22a9c authored almost 8 years ago

Add fast lane deliver

e9e12b2d23a26ec0cac74dfdce033e7411ba30b9 authored almost 8 years ago

Create and fix build, use our Team ID for automatic signing

747ba53e7386776bf92c1c3a3ebaa59fa0281760 authored almost 8 years ago

Merge pull request #60 from TCA-Team/max/snapshot

Add Fastlane Snapshot

c028d8dc4c2c410d260be8e4c47303da56c340be authored almost 8 years ago

Trigger build

2a9963da6ce29fe6493867b5c71680ae55f3726a authored almost 8 years ago

Add Fastlane Snapshot for automatically generating localised screenshots

9e35e6367e988f77caa1db07477e333ac8e5ca97 authored almost 8 years ago

Readme: Add Travis badge and contributing section (#59)

[ci skip]

8865ab0e96bb9d1836edb1966d791b1f1560bbe3 authored almost 8 years ago

Add tests for movie manager (#58)

* Update movie test

* Add Mock for TumDataReceiver

* Add message to assertion

* Refacto...

0832273b65c445654ad8d3eb9dc62c0783e5da1b authored almost 8 years ago

Add Continuous Integration (#56)

* Add .travis.yml configuration

* Share TUM Campus App scheme so Travis can find it

* Use ...

cf1e694509b84919b83b5849e3eb2b40af92e446 authored almost 8 years ago

Merge pull request #55 from TheZoker/update-pods

Update pods again

a1f2ca8864989423c8de78c0432ac2b54f5b4418 authored about 8 years ago

Update pods again

d80cc0c603469ffd01fa127c73ff96450c9b93bc authored about 8 years ago

Merge pull request #54 from TheZoker/feature/56-grades

Add grades function #53

168d4c21b7336ef3c410ddd28d6e44b492026bc1 authored about 8 years ago

Clean code by using Sweeft

34044ff1520a6515277f600a4b3e1d4b5ce72707 authored about 8 years ago

Add grades function #56

3f2e4e2e1765cee30b299008ea1f3b14e81c63fc authored about 8 years ago

Update README.md

ff71c87e6a7695edbd5a978bf693983b367dccde authored about 8 years ago

Update README.md

1cdeadd1436ff01f2fa8cf266e60c8633be78d27 authored about 8 years ago

Merge pull request #51 from TheZoker/update-pods

Update pods dependencies to latest

4b28c63a756d1cf9c8bc289dc24c5413469dbf46 authored about 8 years ago

Update pods dependencies to latest

123792aee03f2ce688dcf298399b4a43dae76d98 authored about 8 years ago

Fix duplicated groups when using pull to refresh

00691b84422fba5dfba4ce4512eed435d0b4c259 authored about 8 years ago

Add group picker to StudyRooms

991f9a395b7c112631e822c58704bcf403cb83a9 authored about 8 years ago

Add PullToRefresh to StudyRooms

As a possible downside the fetched rooms are not cached, when leaving and reentering the study ro...

4a882e7e0484a65a78c202cf057daf8921e78c0c authored about 8 years ago

Link StudyRooms to their RoomFinder Maps onClick.

I therefore extended The RoomFinder VC to handle StudyRooms as well.

af7b5958f1de8cc0a762a7f72c9be836ca070822 authored about 8 years ago

Added StudyRoom basic functionality

ee3d0c8efff29844b0c1336dfcc843094eab8446 authored about 8 years ago

Merge pull request #46 from TCA-Team/feature/allow-saving-cards-and-order

Feature/allow saving cards and order

2512dfa9342ddce81bda61fe657306a71261b494 authored about 8 years ago

Addressing Edge Case of the user doesn't have any cards

4aae885453ec5df9440e1d5bb097e4e7aab56f86 authored about 8 years ago

Merge branch 'master' into feature/allow-saving-cards-and-order

58aefabb76d92c1e42232ec6c0869e11d673172a authored about 8 years ago

Merge pull request #47 from mammuth/34-roomfinder-in-more

Add room finder to more view

3abbe72a77807ca5e74a8520f305bf9d65567874 authored about 8 years ago

Merge branch 'master' into 34-roomfinder-in-more

a3e3224ad5721948fac2405399532499b03f841d authored about 8 years ago

Merge branch 'master' into feature/allow-saving-cards-and-order

dc43da1cb03768d52a35c25703676bb864cc0c14 authored about 8 years ago

Merge pull request #44 from TCA-Team/feature/refactor-a-bit

Refactoring a bit

aef0b72cf237067f352125373bfb4aaac1ca0093 authored about 8 years ago

Merge pull request #48 from mammuth/45-authorization-explanation

Add explanation on how to authorize the app on TUM Online

2209d103214c6ca1cd061d7783e9e0c18aa40813 authored about 8 years ago

Add explanation on how to authorise the app on TUM Online

3b6b8c26cf401a134d5fafeb47266e7f22aa019f authored about 8 years ago

Only show rooms in search result, when using it via the “Room Finder” Link in the More view

ba64e369145375a72f1d022603f87483214029bf authored about 8 years ago