Commits · 46982897f07ae654c2be52372d16c3e8fa2552b5 · Julian Dehm / briar

Jun 30, 2017
- Merge branch '963-load-thread-list-messages-on-start' into 'master' · 46982897
  Torsten Grote authored 7 years ago
  
  Load messages each time activity starts See merge request !547
  46982897
- Merge branch '574-upgrade-tor' into 'master' · d24de68d
  Torsten Grote authored 7 years ago
  
  Upgrade Tor to 0.2.9 Closes #574 See merge request !542
  d24de68d
- Fixed a test. · 0dc62cbb
  akwizgran authored 7 years ago
  
  0dc62cbb
Jun 26, 2017
- Load messages each time activity starts. · d598b6ed
  akwizgran authored 7 years ago
  
  d598b6ed
- Bumped expiry date to 1 September 2017. · f5dc6f24
  akwizgran authored 7 years ago
  
  f5dc6f24
Jun 23, 2017
- Update Tor binaries to 0.2.9.11. · 37454392
  akwizgran authored 7 years ago
  
  37454392
- Update Tor patch to 0.2.9.11. · de7f9111
  akwizgran authored 7 years ago
  
  de7f9111
Jun 15, 2017
- Merge branch 'spongy-castle-1-56' into 'master' · f6412d1e
  Torsten Grote authored 7 years ago
  
  Upgrade Spongy Castle and some other dependencies See merge request !541
  f6412d1e
Jun 12, 2017
- Upgrade Spongy Castle and some other dependencies. · b377cd6b
  akwizgran authored 7 years ago
  
  b377cd6b
May 29, 2017
- Merge branch 'master' of https://code.briarproject.org/akwizgran/briar · f6cdbda5
  Ernir Erlingsson authored 7 years ago
  
  f6cdbda5
- hotfix list restore NPE for user testing · 855c600a
  Ernir Erlingsson authored 7 years ago
  
  855c600a
- Merge branch '954_dont_show_on_startup_failure' into 'master' · ea6e8303
  akwizgran authored 7 years ago
  
  Don't show screenfilter warning in StartupFailureActivity See merge request !539
  ea6e8303
May 22, 2017
- Don't show screenfilter warning in StartupFailureActivity · d4934040
  goapunk authored 7 years ago
  
  Signed-off-by: goapunk <noobie@goapunks.net>
  d4934040
May 19, 2017
- Bumped version number and expiry date. · 3449677b
  akwizgran authored 7 years ago
  
  3449677b
May 12, 2017
- Merge branch '941-store-correct-parent-id' into 'master' · 1ad3a664
  akwizgran authored 7 years ago
  
  Store correct original parent ID when rewrapping blog posts See merge request !534
  1ad3a664
- Merge branch '884-emoji-text-view-layout-bug' into 'master' · 2d10f6b2
  akwizgran authored 7 years ago
  
  Remove ellipsizing support from EmojiTextView Closes #884 See merge request !533
  2d10f6b2
- Merge branch 'master' into '941-store-correct-parent-id' · 5b05424d
  akwizgran authored 7 years ago
  
  # Conflicts: # briar-core/src/test/java/org/briarproject/briar/blog/BlogManagerImplTest.java
  5b05424d
- Merge branch 'bring_annotations_in_line' into 'master' · 0826022d
  akwizgran authored 7 years ago
  
  Bring nullable annotation imports in line See merge request !536
  0826022d
- Merge branch '948-vector-crash' into 'master' · a901bfb9
  akwizgran authored 7 years ago
  
  Remove scientific notation from vector drawables to prevent crashes Closes #948 See merge request !537
  a901bfb9
- Merge branch '947-bluetooth-address-crash' into 'master' · 03cdce12
  akwizgran authored 7 years ago
  
  Don't crash on empty bluetooth addresses See merge request !538
  03cdce12
- Bring nullable annotation imports in line · f2e0e169
  goapunk authored 7 years ago
  
  Signed-off-by: goapunk <noobie@goapunks.net>
  f2e0e169
May 10, 2017
- Don't crash on empty bluetooth addresses · 0c441e2f
  Torsten Grote authored 7 years ago
  
  0c441e2f
- Remove scientific notation from vector drawables to prevent crashes · 21302304
  Torsten Grote authored 7 years ago
  
  Details: http://stackoverflow.com/a/40829348
  21302304
- Merge branch 'wifi-manager-memory-leak' into 'master' · 6839d8b8
  Torsten Grote authored 7 years ago
  
  Use application context to get WifiManager See merge request !535
  6839d8b8
- Merge branch '798-remove-contact-blogs' into 'master' · aee65a71
  Torsten Grote authored 7 years ago
  
  Allow to remove pre-shared blogs of our contacts Closes #798 See merge request !529
  aee65a71
- Allow to remove pre-shared blogs of our contacts · 6a07d8f2
  Torsten Grote authored 7 years ago
  
  6a07d8f2
May 06, 2017
- Merge branch '853-disabled-menu-items' into 'master' · 3c1ea81c
  Ernir Erlingsson authored 7 years ago
  
  Remove theme default color override Closes #853 See merge request !527
  3c1ea81c
- Merge branch '894-list-position-restore' into 'master' · 025f417b
  Ernir Erlingsson authored 7 years ago
  
  save and restore list position for threaded lists Closes #894 and #946 See merge request !528
  025f417b
- final pre-merge fixes · c9dcd906
  Ernir Erlingsson authored 7 years ago
  
  c9dcd906
- fixed final akwizgran comments · 7024e04d
  Ernir Erlingsson authored 7 years ago
  
  7024e04d
May 05, 2017
- Use application context to get WifiManager. · 0b8ac947
  akwizgran authored 7 years ago
  
  0b8ac947
- fixed unread buttons for threaded lists and akwizgran's comments · 948410a0
  Ernir Erlingsson authored 7 years ago
  
  948410a0
- Merge branch '468-ci' into 'master' · 2841339c
  akwizgran authored 7 years ago
  
  Set up basic CI Closes #468 See merge request !530
  2841339c
May 04, 2017
- Update Translations · e8e82bd8
  Torsten Grote authored 7 years ago
  
  e8e82bd8
- Merge branch 'fix_groupname_validation' into 'master' · 6876f40a
  Ernir Erlingsson authored 7 years ago
  
  Fix groupname validation See merge request !531
  6876f40a
May 02, 2017
- improvements after code review #1 · 5f4e1ecd
  Ernir Erlingsson authored 7 years ago
  
  fix
  5f4e1ecd
- list position save and restore now implemented for threaded lists · 04471943
  Ernir Erlingsson authored 7 years ago
  
  04471943
- bumped expire date · d1a929da
  Ernir Erlingsson authored 7 years ago
  
  d1a929da
Apr 29, 2017
- fix group name validation · 2a8978a6
  goapunk authored 7 years ago
  
  Signed-off-by: goapunk <noobie@goapunks.net>
  2a8978a6
Apr 28, 2017
- Set up basic CI · c0afad7a
  Torsten Grote authored 7 years ago
  
  c0afad7a