Commits · 142828038a4ebab5485a9dad390302edf6ececce · Administrator / xabber-android

12 May, 2015 12 commits
- Merge tag '1.0.3' into develop · 14282803
  Grigory Fedorov authored May 12, 2015
```
1.0.3
```
  14282803
- Merge branch 'release/1.0.3' · 3ef61a50
  Grigory Fedorov authored May 12, 2015
  
  3ef61a50
- Version 1.0.3 (code 175) · 267e9b9c
  Grigory Fedorov authored May 12, 2015
  
  267e9b9c
- Missing Translation ling check disabled (due to problems with generated string... · 8c8c1ca4
  Grigory Fedorov authored May 12, 2015
```
Missing Translation ling check disabled (due to problems with generated string "ApplicationId") -  temp solution.
```
  8c8c1ca4
- AvatarManager: fix for #418 crash with conference notifications (drawable to bitmap conversion) · dc5e5342
  Grigory Fedorov authored May 12, 2015
  
  dc5e5342
- CarbonManager: code format (indent) · 2cc0fb51
  Grigory Fedorov authored May 12, 2015
  
  2cc0fb51
- Merge branch 'Semenchikus-XEP-0280' into develop (thanks to @aelmahmoudy) · 797bf743
  Grigory Fedorov authored May 12, 2015
  
  797bf743
- Merge branch 'XEP-0280' of https://github.com/Semenchikus/xabber-android into Semenchikus-XEP-0280 · cd53ba41
  Grigory Fedorov authored May 12, 2015
```
Conflicts:
	res/values-ru/preference_editor.xml
	res/values/preference_editor.xml
	res/values/preferences.xml
	res/xml/preference_editor.xml
	src/com/xabber/android/data/SettingsManager.java
	src/com/xabber/android/data/message/AbstractChat.java
	src/com/xabber/android/data/message/MessageManager.java
```
  cd53ba41
- appcompat library version updated. · f8222bbe
  Grigory Fedorov authored May 12, 2015
  
  f8222bbe
- Gradle version updated. · 6c93c2cc
  Grigory Fedorov authored May 12, 2015
  
  6c93c2cc
- Merge branch 'master' into develop · 45782347
  Grigory Fedorov authored May 12, 2015
  
  45782347
- Update README.rst · 65f6084f
  Grigory Fedorov authored May 12, 2015
```
Build instructions added
```
  65f6084f
30 Apr, 2015 4 commits
- Merge tag '1.0.2' into develop · 8eec4afb
  Grigory Fedorov authored Apr 30, 2015
```
1.0.2
```
  8eec4afb
- Merge branch 'hotfix/1.0.2' · ae9a6af0
  Grigory Fedorov authored Apr 30, 2015
  
  ae9a6af0
- Version 1.0.2 (code 174) · 40c3a75a
  Grigory Fedorov authored Apr 30, 2015
  
  40c3a75a
- "application_package" string resource correctly set in build.gradle · 089d32cd
  Grigory Fedorov authored Apr 30, 2015
```
(no more hardcode, caused crashes with different application id)
```
  089d32cd
29 Apr, 2015 12 commits
- Merge tag '1.0.1' into develop · 5d929191
  Grigory Fedorov authored Apr 29, 2015
```
1.0.1
```
  5d929191
- Merge branch 'hotfix/1.0.1' · f9e25290
  Grigory Fedorov authored Apr 29, 2015
  
  f9e25290
- Version 1.0.1 (code 173) · 20db3abd
  Grigory Fedorov authored Apr 29, 2015
  
  20db3abd
- Incorrect merge fix: preference_editor.xml · 56aa2ac6
  Grigory Fedorov authored Apr 29, 2015
  
  56aa2ac6
- Merge tag '1.0.0' into develop · 09bbbf72
  Grigory Fedorov authored Apr 29, 2015
```
1.0.0
```
  09bbbf72
- Merge branch 'release/1.0.0' · cac564df
  Grigory Fedorov authored Apr 29, 2015
```
Conflicts:
	app/src/main/res/xml/preference_editor.xml
```
  cac564df
- Version 1.0.0 (code 172) · 39f3e9d2
  Grigory Fedorov authored Apr 29, 2015
  
  39f3e9d2
- Development Title changed to "Xabber Beta" · 1b0564e6
  Grigory Fedorov authored Apr 29, 2015
  
  1b0564e6
- Merge branch 'feature/chat_scroll' into develop · 85fa8b1a
  Grigory Fedorov authored Apr 29, 2015
  
  85fa8b1a
- Drawer header image added. Title text style changed. · c038a3df
  Grigory Fedorov authored Apr 29, 2015
  
  c038a3df
- New persistent notification icon · b3215cb0
  Grigory Fedorov authored Apr 29, 2015
  
  b3215cb0
- Red color returned to persistent notification. · 0eef6a7e
  Grigory Fedorov authored Apr 29, 2015
  
  0eef6a7e
28 Apr, 2015 11 commits
- Version 0.10.71 (code 171) · 2483a404
  Grigory Fedorov authored Apr 28, 2015
  
  2483a404
- Merge remote-tracking branch 'origin/feature/chat_scroll' into feature/chat_scroll · d3df533d
  Grigory Fedorov authored Apr 28, 2015
  
  d3df533d
- Contact list drawer: translation corrected and header font style changed. · 7313c0d6
  Grigory Fedorov authored Apr 28, 2015
  
  7313c0d6
- Message notifications removing fixed. · 6093fe43
  Grigory Fedorov authored Apr 28, 2015
  
  6093fe43
- Copyright updated. · aabe3254
  Grigory Fedorov authored Apr 28, 2015
  
  aabe3254
- Chat: keyboard do not hide everything in landscape mode. · 7da96c0c
  Grigory Fedorov authored Apr 28, 2015
  
  7da96c0c
- ContactListDrawerFragment layout changed, header and divider added. · bfb1cbf9
  Grigory Fedorov authored Apr 28, 2015
  
  bfb1cbf9
- Chat scroll indicator: recent chats square painted in main (first) account color. · cc7a39e8
  Grigory Fedorov authored Apr 28, 2015
  
  cc7a39e8
- Refactoring: AccountPainter used in BarPainter and StatusBarPainter. · 21ab40e2
  Grigory Fedorov authored Apr 28, 2015
  
  21ab40e2
- New AccountPainter class. Notification and ActiveChats are painted with it. · 6eb9e0ca
  Grigory Fedorov authored Apr 28, 2015
  
  6eb9e0ca
- Merge pull request #409 from aelmahmoudy/easy_theme · 3ee2175c
  Grigory Fedorov authored Apr 28, 2015
```
Set textColor value to textColorPrimary attribute to facilitate theme'ing
```
  3ee2175c
27 Apr, 2015 1 commit
- Set textColor value to textColorPrimary attribute to facilitate theme'ing · 684bdfe6
  أحمد المحمودي (Ahmed El-Mahmoudy) authored Apr 27, 2015
  
  684bdfe6