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

Merge branch 'mammuth/study-rooms-screenshot' of https://github.com/TCA-Team/iOS

916cad81285f44a1c7d075c5c642f26023dc1716 authored over 7 years ago

Add screenshot for study rooms (#186)

Closes #169, #173

91769b81b29c5e26323beb64cbad31df9ec8a546 authored over 7 years ago

Merge branch 'master' into mammuth/study-rooms-screenshot

5f9302c1216af5841c8cb4e2449b792716ed04dc authored over 7 years ago

Fix manual calendar updating (#187)

- remove current calendar items from the manager before appending the new ones
- directly updat...

0b098ee8b2bb55cb7612100cd956bbbf67344962 authored over 7 years ago

150 - Fix issue with user info not being updated correctly (#170)

* 150 - Fix issue with user info not being updated correctly

* 150 - Update TUMDataManager's ...

5f2aa24fbb2948b06c59b151e26a53b5058fd51a authored over 7 years ago

Merge branch 'master' of https://github.com/TCA-Team/iOS

22aa753bbf9793af99969d49d9da06defd1d86fc authored over 7 years ago

Mathias/port old credentials to keychain (#183)

* updated pods

* Adding compatibility layer between keychain and userdefaults

* Synching u...

62bd108b0393fb426253cead6be4e5fd24485531 authored over 7 years ago

Add screenshot for study rooms

Closes #169, #173

58bd7889da53906e27a18150de5c4495c30f264b authored over 7 years ago

Create CHANGELOG.md (#185)

441f95926163e8db615628b9ca84cc0dcbadc8ba authored over 7 years ago

New UI Design (step 1) (#164)

* new card design

* Delete NewCardTableViewCell.swift

* updated pods

* mrg

...

28e865dd61e1746108017877d2d74048099a861d authored over 7 years ago

Mathias/persist token awaiting (#171)

* Add state of persistet user

* Persisting Awaiting User Info after login started

* Includ...

f6f2abf1217dc5a6f27f16482af5c95f8842acf4 authored over 7 years ago

Update fastlane snapshot (#175)

- Update snapshot helper for use with fastlane 2.62.0 (with older versions we have errors with x...

d4d5b96689c18c6838b0f78d9ff0f9797d7a90d5 authored over 7 years ago

Larry/131 confirm button & input error indication (#161)

* Add confirm button to LoginViewController
Add error indication for invalid textfield input
r...

d55614040700159cd1e3df9ba844c5a208fb6422 authored over 7 years ago

Try to fix Travis CI (#166)

* Don't pin fastlane to a fixed version in order to try to fix the CI

* Updating Xcode to 9.0...

bd9e7d1bb5000c6b2e74ffe988ad5073be274897 authored over 7 years ago

Merge branch 'master' of https://github.com/TCA-Team/iOS

# Conflicts:
# Podfile
# Podfile.lock

15d5dc9a5d2a79d182124fe7ffea6d90ec86bae6 authored over 7 years ago

Also in userdata

01de5159cfdbf4e599cbd768b929f1a9ffbb2e6e authored over 7 years ago

Removing use of removed enums

677ad4e512a9e9f88231e11c6698da1afb20859a authored over 7 years ago

Update README.md

cd5ee7762bedbd23125bbd34603fdd77cda35b45 authored over 7 years ago

Add WhatsApp link to readme (#168)

[ci skip]

a9b4051ac91c87404ae5f97d935c9de1606b2aef authored over 7 years ago

Removing unused enum cases

016094ecb03da47981568fa575c419954aac28c3 authored over 7 years ago

Removing unused file

fc349e40d2024e656985dc17fb97072fc42a93c0 authored over 7 years ago

Removing TumDataReceiver and BulkRequest

c15fa212d93cbe5d23f96afbe9e3b3248fb4b7dd authored over 7 years ago

Add refresh capabilities to calendar (#162)

* Add refresh capabilities to calendar

* Use system refresh icon, indicate refresh is in process

4e19fe4c4d728d972d8186ce987a4440c782061b authored over 7 years ago

Refactoring urls to config.json

eae53038e15f7d2d492405343eb4b7c64bdb08d3 authored over 7 years ago

Removing CafeteriaMenuManager

e0486a463dc7aef05ff0c353ec228e8a5f189f2c authored over 7 years ago

Fixing Cafeteria Menu

8139460c1265e6de4deee6d5227855bdab70a8bb authored over 7 years ago

Making Cafeteria initializable with json

4b8e9ca01f7ccb2a541cd407e5abc40f708acd20 authored over 7 years ago

Updating movies view

a17f393a2c33716fce237e5b51fe0844723441f5 authored over 7 years ago

Calling Tum Sexy updates on the main queue

8cc8d6025359d1e50f92ef7eee54134e0242e898 authored over 7 years ago

Fixing search manager being refreshed with old data

486d3877beec5013fc2eb305b2b507839338d036 authored over 7 years ago

Sorting studyrooms by free or occupied

ee847f09cb2bc5d5ddff163ecb3bfde48a4e3819 authored over 7 years ago

Fixing StudyRooms and StudyRoomGroups parsing

7e0fffbc965f5b3118afb1739fa0b35e40b7c4c6 authored over 7 years ago

Fixing grades fetching

bd123b35567a640a1409352e9ed9a13df84440ec authored over 7 years ago

Making all the delegates weak

I’m so stupid

43f3fe92302066dfa6f6850c48dc9d2f7d510335 authored over 7 years ago

Fixing Roomfinder image display

73f26b7309edf69ec47cca5168fe887b3527f890 authored over 7 years ago

Fixing person search

08c71d16522b9018345af6cb50128c8d88d31608 authored over 7 years ago

Adding more managers

e26d48ed5d35dd3412e74cd3f8858590d438a6a9 authored over 7 years ago

Fixing Roomfinder and Studyrooms apis

2fe8f40e2884f5e439b340616e7dca9450ef6fad authored over 7 years ago

Removing old manager protocol

02234a0669454b4a782ac011e549220a72056f13 authored over 7 years ago

Getting the card ui to show

2aa4a0621594cba0b6a6d70a13724c732919d3be authored over 7 years ago

Updating everything to lates Sweeft

0d8b4bc58c21ec42dc8105fee0a44ae547c6f917 authored over 7 years ago

Merge branch 'master' into mathias/network-refactor

# Conflicts:
# Podfile.lock
# TUM Campus App.xcodeproj/project.pbxproj
# TUM Campus App/Calendar...

984218a2c00c87e324da25445a2a1b237d3a215e authored over 7 years ago

Updating Pods (#154)

* updated pods

* Updating Sweeft

* Moving User Token to Keychain

bfa53ea4363c6453a21963ca2e325bc2509245ca authored over 7 years ago

Merge branch 'Larry/131-Confirm-Button' of https://github.com/TCA-Team/iOS

eacd27dd60cec39e061afd7dbe26740712cc58b8 authored over 7 years ago

Fix issues with wonky ID input (#152)

69cb69207aa7bb0100de8264a49780fb98a0ed58 authored over 7 years ago

updated pods

11d8901a4348684f9089c15abd824d93200f4fb6 authored over 7 years ago

147 Hide Service tab on More screen (#149)

* 147 Hide Service tab on More screen

* 147 Hide "Default Campus" cell

ca5e966f5fb315a8d106672fa0b2dce6dd7f8684 authored over 7 years ago

Implemented “nearby stations” and “upcoming departures” (#141)

e9dbe26a1c7bed716d351ca26ee4598685266525 authored over 7 years ago

#145 Remove `reset_simulators` build step (#146)

#145 Remove reset simulators build step

b200597f495ee1d5e2db9909d67605ae1e921a03 authored over 7 years ago

Merge pull request #143 from rodalfus/139-fix-login-flow

139 - Fix issue where the login view controller was presented inefficiently

2e16e18ca163296dbf16643889b53a233c33ee35 authored over 7 years ago

139 Add custom name for test results in html

3c3b7c72888d6fb5063bc1776ca0fcc0f1199edc authored over 7 years ago

139 Possibly fix fastlane scan issue

46db8839a8d5443522ac47b64498b4c79ce45f1f authored over 7 years ago

139 Update Travis CI Xcode version

d403d668301d3a411572190e8e1abb3fdeafcaa8 authored over 7 years ago

139 Possibly fix fastlane issue with simulator removal

1c794f8be4c4bf01618396e40e38f946b49ba9ae authored over 7 years ago

139 Fix indentation and type

9830436fa19b03a1dbfcb42a6c80f4570eec0e06 authored over 7 years ago

139 - Fix issue where the login view controller would be presented in an inefficient manner

ff147b8d4dd2b1c6c5e8088775ee7d4f47b7c7e9 authored over 7 years ago

Merge pull request #138 from lukaskollmer/lukas/open-news-in-app

Open news items in SFSafariViewController

b1cfd2f1fa505414e3f46af122427bf3efa8e424 authored over 7 years ago

Open news items in SFSafariViewController

db1f0d419121d6418272ce2229821d1d26b2f3b5 authored over 7 years ago

Remove unnecessary brace (#136)

0f201ccda97186d573850106fd1316acc513e54a authored over 7 years ago

Update README

b0c8bf67b0c3bd83c4bdcf641c1fb8f3b6f124eb authored over 7 years ago

Moving User Data Manager to new refactored manager model

d6f4f56c913021f51a0c98b1a3e4fb885764c1a0 authored over 7 years ago

Caching *ALL* the things. (Ca$hing)

7956afbcc4fdf88ff834a6ab6851e05ef539ffbe authored over 7 years ago

Updating Sweeft to 0.9

b4be5ce05a1a51b4133e74db522025d03f11b7fc authored over 7 years ago

Dismiss picker on view disappearing (#126)

* Dismiss picker on view disappearing
[ci skip]

* Update icon when dismissing by tapping any...

62195141c0f6eade5942f00711e75ecce6e54055 authored over 7 years ago

Tim/103 calendar location (#129)

* added location to model

* added location to nextLecture Card

* added location to eventView

dcd22247555cbf86c3192fa6cb50c4c89e1b9ffd authored over 7 years ago

Starting to revamp the login

55eca24af543e66e3bd891fb8bda4b755232d49c authored over 7 years ago

Updating Sweeft (#106)

* Updating Sweeft

* Updating again and using the correct version of pods

* Removing unnece...

26b20660c29a2724fc9cd86b4770f9c26c024ecc authored over 7 years ago

Cleaning Up cache managers

de8c0b249372e30018077927c5333140d0c2891f authored over 7 years ago

Update BookRentals

9176ea9a06b70bdf3787b54afb63cde72820f365 authored over 7 years ago

Removing pods stuff again

ca69b0b7177b19243058f3ab3cd4c4b51bfdf09e authored over 7 years ago

Merge branch 'mathias/dependency-update' into mathias/network-refactor

# Conflicts:
# Pods/Pods.xcodeproj/project.pbxproj

3f9b3c174fc03d61005459a3c2959e08fbbb569c authored over 7 years ago

Removing all pods stuff again

2c7ff7624fe7193dee3a1e7e6a75b7d91c796232 authored over 7 years ago

Merge branch 'mathias/dependency-update' into mathias/network-refactor

# Conflicts:
# Pods/Pods.xcodeproj/project.pbxproj
# Pods/Target Support Files/Pods-Campus/Pods-...

2fa77ebafecb887cd489fb5708a0e2f037cf4d10 authored over 7 years ago

Removing unnecessary files and Updating again for good measure

c68047aa9e20cfc420ff48eb6994d1db74d11ebd authored over 7 years ago

Merge

e84d469f3683d28e76fbf9a79d56618f2dc4127f authored over 7 years ago

Remove pods (#112)

* Remove Pods/

* Add Pods/ to .gitignore

* Add pod repo update to .travis.yml

* Pod rep...

a9a4c3f7406ae3ceacbed2a0955c46fbfde316c4 authored over 7 years ago

Tim/108-emailFeedback (#114)

* Added subject: [iOS] to support mail

* Added MFMailComposeViewController

* Added iOS, Ap...

d81bc1117c6fccc2b2f70e58591846b53d893c1e authored over 7 years ago

Updating Lecture Details Manager

93be71313ef92f06cd5e6706eb69ab00e875c6c0 authored over 7 years ago

Updating Search Managers

9267409c67a13e31179823c4a439d7f0199b7a69 authored over 7 years ago

Tim/app group (#113)

* Added AppGroup

d65e8003f60e0e4a4232f9767b6f5759ee94e1d7 authored over 7 years ago

Updating Personal Grades and Personal Lectures

6db9ad5aaa16d9048e8c74952696210c0bbafb1b authored over 7 years ago

Updating NewsManager and TumSexy Manager

0398f9ade79da7d75aabad4a206d2355cbf909d1 authored over 7 years ago

Updating again and using the correct version of pods

e8a3b31265a91609ba19f57aee5bb003fb51e77f authored almost 8 years ago

Merge remote-tracking branch 'origin/master' into mathias/dependency-update

# Conflicts:
# Pods/Pods.xcodeproj/project.pbxproj
# Pods/Target Support Files/Pods-Campus/Pods-...

dc7e10816dc07cd15c244750dd57219352e684a3 authored almost 8 years ago

Starting the refactor

f27acc1f35d61a276e8041a59041b21f3b5bd903 authored almost 8 years ago

Tim/76 book rental card (#98)

* Added proof of concept

* Added Kanna

* Added BookRental and BookRentalM...

2294abd6148356c6c85917b49f209f8c7942081a authored almost 8 years ago

Updating Sweeft

9a9294f44e03bb91c97fcce025fa309980e8aca9 authored almost 8 years ago

Bump version to 1.1. Submitted to App Store (#102)

97e3430ba471f3e18097b20561825f624f6985e1 authored almost 8 years ago

Tim/82 card type label (#97)

* Added type labels to every card

* CardType label text is now white

* Adding Padding to f...

eb343ff45a411d2876b2d5e9777e83dde05095df authored almost 8 years ago

Fixed Regex (#92)

64e5f994031ddfe0c031496200bef8657e165ad1 authored almost 8 years ago

Prettify time until next lecture (#91)

* Used DateComponentsFormatter to display time remaining

* slight tweaks to the DateComponent...

5eee68cfcb07d04584eb931d3da84f405577de7b authored almost 8 years ago

Allow for non TUM user use. Closes #64

* Adding Skip Button to login

* Adding back `more` items from before

* Fixing not implemen...

2d86b832ee6b65bb99ced18a6ce814dbb6210be1 authored almost 8 years ago

Adding *very sexy* TUM Sexy Screen

* Adding Sexy entries

* Adding sexyEntry method to Manager

* Adding TumSexy View

* Simp...

2054fbf6f0d668a3bb2a9427b378af99694b53a5 authored almost 8 years ago

Add PR template and more contributing guidelines (#88)

* Add PR template and more contributing guidelines
[ci skip]

* Listen to the guys at english...

77988f362ae78c7d727fe7bdfa31959d83380e89 authored almost 8 years ago

Merge pull request #78 from TCA-Team/Tim/MovieCard_fix

Tim/movie card fix

d14b4737a44110fd1904474bbc07ce5ba1c9d1cc authored almost 8 years ago

Merge branch 'master' into Tim/MovieCard_fix

8343b80fc673890086eaf811e57df4cd722ed0a0 authored almost 8 years ago

Merge pull request #49 from mammuth/feature/24-study-rooms

StudyRoom Feature

db94c385fee660d0115eb80a667e5bf11fac1a09 authored almost 8 years ago

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

6649b766b0799a6f344de95c0b78a3b624ff8b42 authored almost 8 years ago

Merge pull request #81 from TCA-Team/max/contributing-instructions

Add contributing guidelines

67747b81fe806e067f547b46ea34b7da676e5771 authored almost 8 years ago

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

f499f9ff3c44f53e7eb199f541e3be48f7ac8901 authored almost 8 years ago