Commit Graph

13178 Commits

Author SHA1 Message Date
manuroe e1c8f905bb Removed duplicated README 2015-04-09 10:05:12 +02:00
manuroe 664ae0f8b4 Updated with changes on MatrixKit recents 2015-04-09 08:56:58 +02:00
manuroe b94e041b2d Updated with changes on MatrixKit recents 2015-04-09 08:53:12 +02:00
giomfo e6134edd0e Attributes renaming. 2015-04-07 16:22:40 +02:00
giomfo 5271c63edf Code cleaning 2015-04-07 16:12:05 +02:00
giomfo af5d694b76 Code cleaning 2015-04-07 16:11:44 +02:00
David Baker 0a4682c200 Merge branch 'master' into develop 2015-04-07 11:16:43 +01:00
David Baker 38bd15c7b1 Still can't clean if we don't have an xcworkspace yet 2015-04-07 11:14:47 +01:00
David Baker 7b5aec0fe3 Don't check pod install has been run if we're only cleaning 2015-04-07 11:07:48 +01:00
manuroe d379cb35c0 Made podfile points to develop pod on develop branch 2015-04-07 09:21:30 +02:00
manuroe 4642e0ec2f Update README.rst
with MatrixKit as we now use it
2015-04-03 18:29:46 +02:00
manuroe e1f00a3879 Podfile Came back to local as MatrixKit develope does not get MatrixSDK develop 2015-04-03 18:19:06 +02:00
manuroe 910a2e7910 Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	Console/Podfile
	Console/Podfile.lock
	Console/matrixConsole.xcodeproj/project.pbxproj
	Console/matrixConsole/API/MatrixSDKHandler.m
	Console/matrixConsole/AppDelegate.h
	Console/matrixConsole/AppDelegate.m
	Console/matrixConsole/Base.lproj/Main.storyboard
	Console/matrixConsole/Model/MXCContactField.m
	Console/matrixConsole/Model/MXCEmail.m
	Console/matrixConsole/Model/RageShakableUIResponder.h
	Console/matrixConsole/Model/RageShakableUIResponder.m
	Console/matrixConsole/View/ContactTableCell.h
	Console/matrixConsole/View/MXCGrowingTextView.m
	Console/matrixConsole/View/RoomMemberTableCell.h
	Console/matrixConsole/View/RoomMemberTableCell.m
	Console/matrixConsole/ViewController/AuthenticationViewController.m
	Console/matrixConsole/ViewController/ContactsViewController.m
	Console/matrixConsole/ViewController/MasterTabBarController.m
	Console/matrixConsole/ViewController/MemberViewController.m
	Console/matrixConsole/ViewController/RecentsViewController.h
	Console/matrixConsole/ViewController/RecentsViewController.m
	Console/matrixConsole/ViewController/RoomViewController.h
	Console/matrixConsole/ViewController/RoomViewController.m
	Console/matrixConsole/ViewController/SettingsViewController.m
2015-04-03 18:01:43 +02:00
manuroe 377c945321 Moved matrixConsole to Console 2015-04-03 16:20:36 +02:00
giomfo 77c755e55d Console: Implement Recents List based on MatrixKit. 2015-04-03 15:02:16 +02:00
manuroe 90f5a2a813 Merge remote-tracking branch 'origin/release-v0.3.2' 2015-04-03 11:57:20 +02:00
manuroe 060b135d87 Delete README.md 2015-04-03 11:56:54 +02:00
manuroe 3b7c4f12fa Delete README.md 2015-04-03 11:55:20 +02:00
manuroe dd7bda8424 Merge remote-tracking branch 'origin/release-v0.3.2' 2015-04-03 11:53:29 +02:00
manuroe ce57aaa7fa MatrixSDK repo splitting: Fake release called 0.3.2 to match the one from the original repo 2015-04-03 11:47:26 +02:00
manuroe 6737146912 Update README.rst
Fixed boldface for the WIP section
2015-04-03 11:16:13 +02:00
manuroe a94d6c0e03 Update README to indicate this a WIP 2015-04-03 11:13:05 +02:00
manuroe b70a9d2f13 Updated README 2015-04-03 11:08:30 +02:00
manuroe a0a6681ed3 Added a changes file 2015-04-03 10:29:27 +02:00
manuroe 7971740529 Moved code under a subdirectory: Console 2015-04-03 09:04:46 +02:00
manuroe 2b0350d14f Moved code under a subdirectory: Console 2015-04-03 09:04:22 +02:00
manuroe 1b24cdb7f1 Podfile: Added the versionned pod 2015-04-03 08:53:09 +02:00
manuroe 09eb12614e Podfile: List all versions of the MatrixSDK pod: release, develop branch and local for development 2015-04-03 08:43:07 +02:00
giomfo 2c7a2ac80a Console: Remove useless classes (RoomMessage, RoomMessageComponent). 2015-04-02 17:58:32 +02:00
giomfo 9c7f399a9a Console: Support rage shake in Room view controller by using MXKResponderRageShaking protocol. 2015-04-02 16:55:26 +02:00
manuroe 986b0711a1 Fix to point to the matrix-ios-sdk repo locally 2015-04-02 15:08:22 +02:00
manuroe ed521c9487 Delete README.md 2015-04-02 14:57:31 +02:00
manuroe 82dcee2cae Create README.md
Say this is a WIP
2015-04-02 14:45:43 +02:00
manuroe 3a372af6c0 Initial commit 2015-04-02 14:45:43 +02:00
manuroe c4918c3b93 Create README.md
Say this is a WIP
2015-04-02 14:32:24 +02:00
manuroe 44a682db16 Initial commit 2015-04-02 14:23:23 +02:00
giomfo d371ca2cc1 Console: Remove MXCImageView, and Console MediaManager in order to use MatrixKit's objects. 2015-04-02 13:50:11 +02:00
giomfo 9638bdef8f Console: Replace MXCTools with MXKTools from matrix kit 2015-04-02 13:33:04 +02:00
manuroe accf920d8a Console: Use the new MatrixKit repo 2015-04-02 12:16:25 +02:00
giomfo d0bea40f64 Console: Replace MXCAlert with MXKAlert from matrix kit. 2015-04-02 11:33:41 +02:00
giomfo 3b41617b82 Console: Use room input toolbar view based on HPGrowingTextView. 2015-04-02 00:25:41 +02:00
giomfo 45eb07c1d0 Console: Rename close method with destroy. 2015-04-01 11:06:48 +02:00
giomfo 2cee39841a Console: Close unused room view controllers. 2015-03-31 18:33:37 +02:00
giomfo a129240655 Console: Handle room data source state change. 2015-03-31 17:51:25 +02:00
giomfo b3568ac109 Console: Rewrite room view controller by using MatrixKit 2015-03-31 15:09:17 +02:00
manuroe 68dbef8ddc MatrixKit: Podfile.lock new versions for AFNetworking & MatrixSDK 2015-03-27 16:56:25 +01:00
manuroe e4ce21e000 Merge remote-tracking branch 'origin/develop' into matrix_kit 2015-03-27 16:42:33 +01:00
manuroe 08d731d026 0.3.2 release 2015-03-27 15:42:49 +01:00
manuroe 07bfc46f0a 0.3.2 release 2015-03-27 15:42:49 +01:00
manuroe 9183d86daa Updated AFNetworking version: 2.4.1 -> 2.5.2 2015-03-27 13:23:33 +01:00