Skip to content

Commit 0d13093

Browse files
committed
Merge branch 'release/3.3'
2 parents d8d14ae + e2fcf23 commit 0d13093

File tree

225 files changed

+3885
-4448
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

225 files changed

+3885
-4448
lines changed

.gitmodules

+9-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
[submodule "iMEGA/Vendor/SVProgressHUD"]
88
path = iMEGA/Vendor/SVProgressHUD
99
url = https://github.com/SVProgressHUD/SVProgressHUD.git
10-
[submodule "iMEGA/Vendor/sskeychain"]
11-
path = iMEGA/Vendor/sskeychain
12-
url = https://github.com/meganz/sskeychain.git
1310
[submodule "iMEGA/Vendor/GKContactImage"]
1411
path = iMEGA/Vendor/GKContactImage
1512
url = https://github.com/gekitz/GKContactImage.git
@@ -37,3 +34,12 @@
3734
[submodule "iMEGA/Vendor/PureLayout"]
3835
path = iMEGA/Vendor/PureLayout
3936
url = https://github.com/smileyborg/PureLayout
37+
[submodule "iMEGA/Vendor/UIBarButtonItem-Badge"]
38+
path = iMEGA/Vendor/UIBarButtonItem-Badge
39+
url = https://github.com/meganz/UIBarButtonItem-Badge.git
40+
[submodule "iMEGA/Vendor/PieChartView"]
41+
path = iMEGA/Vendor/PieChartView
42+
url = https://github.com/astrokin/PieChart.git
43+
[submodule "iMEGA/Vendor/SAMKeychain"]
44+
path = iMEGA/Vendor/SAMKeychain
45+
url = https://github.com/soffes/SAMKeychain.git

CREDITS.md

+285
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,285 @@
1+
## CREDITS
2+
3+
Here is the list of the external libraries used by the iOS Client.
4+
We thank them all for their contributions:
5+
6+
#### AMLocalizedString
7+
https://github.com/tagyro/AMLocalizedString
8+
9+
Copyright (c) 2010-2015 Juan Albero Sanchis
10+
11+
###### License:
12+
13+
https://github.com/tagyro/AMLocalizedString/blob/master/LICENSE
14+
15+
--------------------------------------------------------------------
16+
17+
#### CTAssetsPickerController
18+
https://github.com/chiunam/CTAssetsPickerController
19+
20+
Copyright (c) 2015 Clement CN Tsang
21+
###### License:
22+
The MIT License (MIT)
23+
24+
https://github.com/chiunam/CTAssetsPickerController/blob/master/LICENSE
25+
26+
--------------------------------------------------------------------
27+
28+
#### DateTools
29+
https://github.com/MatthewYork/DateTools
30+
31+
Copyright (c) 2014 Matthew York
32+
33+
###### License:
34+
The MIT License (MIT)
35+
36+
https://github.com/MatthewYork/DateTools/blob/master/LICENSE
37+
38+
--------------------------------------------------------------------
39+
40+
#### DZNEmptyDataSet
41+
https://github.com/dzenbot/DZNEmptyDataSet
42+
43+
Copyright (c) 2016 Ignacio Romero Zurbuchen [email protected]
44+
45+
###### License:
46+
The MIT License (MIT)
47+
48+
https://github.com/dzenbot/DZNEmptyDataSet/blob/master/LICENSE
49+
50+
--------------------------------------------------------------------
51+
52+
#### GKContactImage
53+
https://github.com/gekitz/GKContactImage
54+
55+
Copyright (c) 2014 Georg Kitz
56+
57+
###### License:
58+
The MIT License (MIT)
59+
60+
https://github.com/gekitz/GKContactImage/blob/master/LICENSE
61+
62+
--------------------------------------------------------------------
63+
64+
#### LTHPasscodeViewController
65+
https://github.com/rolandleth/LTHPasscodeViewController
66+
67+
Copyright (c) 2013 Roland Leth
68+
69+
###### License:
70+
The MIT License (MIT)
71+
72+
https://github.com/rolandleth/LTHPasscodeViewController/blob/master/LICENSE.txt
73+
74+
--------------------------------------------------------------------
75+
76+
#### MWPhotoBrowser
77+
https://github.com/meganz/MWPhotoBrowser
78+
79+
Copyright (c) 2010 Michael Waterfall <[email protected]>
80+
81+
###### License:
82+
The MIT License (MIT)
83+
84+
https://github.com/mwaterfall/MWPhotoBrowser/blob/master/LICENSE
85+
--------------------------------------------------------------------
86+
87+
#### PieChart
88+
https://github.com/astrokin/PieChart
89+
90+
Copyright (c) 2013 Alexey
91+
92+
###### License:
93+
The MIT License (MIT)
94+
95+
https://github.com/astrokin/PieChart/blob/master/LICENSE
96+
97+
--------------------------------------------------------------------
98+
99+
#### PureLayout
100+
https://github.com/PureLayout/PureLayout
101+
102+
Copyright (c) 2014-2015 Tyler Fox
103+
104+
###### License:
105+
The MIT License (MIT)
106+
107+
https://github.com/PureLayout/PureLayout/blob/master/LICENSE
108+
109+
--------------------------------------------------------------------
110+
111+
#### Reachability
112+
https://github.com/tonymillion/Reachability
113+
114+
Copyright (c) 2011-2013, Tony Million.
115+
116+
###### License:
117+
https://github.com/tonymillion/Reachability/blob/master/LICENCE.txt
118+
119+
--------------------------------------------------------------------
120+
121+
#### SAMKeychain
122+
https://github.com/soffes/SAMKeychain
123+
124+
Copyright (c) 2010-2016 Sam Soffes, http://soff.es
125+
126+
###### License:
127+
The MIT License (MIT)
128+
129+
https://github.com/soffes/SAMKeychain/blob/master/LICENSE
130+
131+
--------------------------------------------------------------------
132+
133+
#### SVProgressHUD
134+
https://github.com/SVProgressHUD/SVProgressHUD
135+
136+
Copyright (c) 2011-2016 Sam Vermette, Tobias Tiemerding and contributors.
137+
138+
###### License:
139+
The MIT License (MIT)
140+
141+
https://github.com/SVProgressHUD/SVProgressHUD/blob/master/LICENSE.txt
142+
143+
--------------------------------------------------------------------
144+
145+
#### SVWebViewController
146+
https://github.com/TransitApp/SVWebViewController
147+
148+
Copyright (c) 2011 Sam Vermette
149+
150+
###### License:
151+
The MIT License (MIT)
152+
153+
https://github.com/TransitApp/SVWebViewController/blob/master/LICENSE.txt
154+
155+
--------------------------------------------------------------------
156+
157+
#### UIBarButtonItem-Badge
158+
https://github.com/meganz/UIBarButtonItem-Badge
159+
160+
###### License:
161+
The MIT License (MIT)
162+
163+
--------------------------------------------------------------------
164+
165+
#### MEGA C++ SDK
166+
https://github.com/meganz/sdk
167+
168+
(c) 2013-2016 by Mega Limited, Auckland, New Zealand
169+
170+
###### Description:
171+
MEGA --- The Privacy Company --- is a Secure Cloud Storage provider that protects
172+
your data thanks to end-to-end encryption. We call it User Controlled Encryption,
173+
or UCE, and all our clients automatically manage it.
174+
175+
All files stored on MEGA are encrypted. All data transfers from and to MEGA
176+
are encrypted. And while most cloud storage providers can and do claim the same,
177+
MEGA is different – unlike the industry norm where the cloud storage provider
178+
holds the decryption key, with MEGA, you control the encryption, you hold the keys,
179+
and you decide who you grant or deny access to your files.
180+
181+
This SDK brings you all the power of our client applications and let you create
182+
your own or analyze the security of our products.
183+
184+
###### Usage:
185+
MEGAsync uses the MEGA C++ SDK to get all functionality that requires access
186+
to MEGA servers.
187+
188+
###### License:
189+
Simplified (2-clause) BSD License.
190+
191+
https://github.com/meganz/sdk/blob/master/LICENSE
192+
193+
--------------------------------------------------------------------
194+
195+
#### MEGA C++ SDK
196+
https://github.com/meganz/sdk
197+
198+
(c) 2013-2016 by Mega Limited, Auckland, New Zealand
199+
200+
###### Description:
201+
MEGA --- The Privacy Company --- is a Secure Cloud Storage provider that protects
202+
your data thanks to end-to-end encryption. We call it User Controlled Encryption,
203+
or UCE, and all our clients automatically manage it.
204+
205+
All files stored on MEGA are encrypted. All data transfers from and to MEGA
206+
are encrypted. And while most cloud storage providers can and do claim the same,
207+
MEGA is different – unlike the industry norm where the cloud storage provider
208+
holds the decryption key, with MEGA, you control the encryption, you hold the keys,
209+
and you decide who you grant or deny access to your files.
210+
211+
This SDK brings you all the power of our client applications and let you create
212+
your own or analyze the security of our products.
213+
214+
###### Usage:
215+
iOS uses the MEGA C++ SDK to get all functionality that requires access
216+
to MEGA servers.
217+
218+
###### License:
219+
Simplified (2-clause) BSD License.
220+
221+
https://github.com/meganz/sdk/blob/master/LICENSE
222+
223+
--------------------------------------------------------------------
224+
225+
#### Dependencies of the MEGA C++ SDK
226+
Due to the usage of the MEGA C++ SDK, MEGAsync requires some additional
227+
libraries. Here is a brief description of all of them:
228+
229+
#### c-ares:
230+
Copyright 1998 by the Massachusetts Institute of Technology.
231+
232+
c-ares is a C library for asynchronous DNS requests (including name resolves)
233+
234+
http://c-ares.haxx.se/
235+
236+
License: MIT license
237+
238+
http://c-ares.haxx.se/license.html
239+
240+
#### libcurl
241+
Copyright (C) 1998 - 2016, Daniel Stenberg, <[email protected]>, et al.
242+
243+
The multiprotocol file transfer library
244+
245+
https://curl.haxx.se/libcurl/
246+
247+
License: MIT/X derivate license
248+
249+
https://curl.haxx.se/docs/copyright.html
250+
251+
#### Crypto++
252+
Copyright (c) 1995-2013 by Wei Dai. (for the compilation) and public domain (for individual files)
253+
254+
Crypto++ Library is a free C++ class library of cryptographic schemes.
255+
256+
https://www.cryptopp.com/
257+
258+
License: Crypto++ Library is copyrighted as a compilation and (as of version 5.6.2)
259+
260+
licensed under the Boost Software License 1.0, while the individual files in
261+
the compilation are all public domain.
262+
263+
#### OpenSSL
264+
Copyright (c) 1998-2016 The OpenSSL Project. All rights reserved.
265+
266+
A toolkit implementing SSL v2/v3 and TLS protocols with full-strength cryptography world-wide.
267+
268+
https://www.openssl.org/
269+
270+
License: OpenSSL License
271+
272+
https://github.com/openssl/openssl/blob/master/LICENSE
273+
274+
#### libuv
275+
Copyright Joyent, Inc. and other Node contributors. All rights reserved.
276+
277+
libuv is a multi-platform support library with a focus on asynchronous I/O.
278+
279+
https://github.com/libuv/libuv
280+
281+
License: MIT
282+
283+
https://github.com/libuv/libuv/blob/v1.x/LICENSE
284+
285+
--------------------------------------------------------------------

0 commit comments

Comments
 (0)