Sitelet https://github.com/JavaJens/TextSecure/pull/25
Skip to content

Merge upstream 2.24.0 into Feature/websocket reborn - #25

Merged
JavaJens merged 41 commits into
JavaJens:feature/websocket-rebornfrom
relyt29:feature/websocket-reborn
Aug 3, 2015
Merged

JavaJens merged 41 commits into
JavaJens:feature/websocket-rebornfrom
relyt29:feature/websocket-reborn

Conversation

@relyt29

@relyt29 relyt29 commented Jul 31, 2015

Copy link
Copy Markdown

Tested the usual way. Please merge libtextsecure-java 2.62 in order to build 2.24.0.

adb-screenshot-2015-07-31-16-03-10-870206327

moxie0 and others added 30 commits July 24, 2015 10:39
this also changes BUILDING.md to reflect the new syntax of pngs_from_svg.py

fixes signalapp#3769
closes signalapp#3770

// FREEBIE
// FREEBIE
// FREEBIE
that was freaking annoying

// FREEBIE
it doesn't react to layout changes correct, better
to not have it for the time being.

closes signalapp#3718
closes signalapp#3812
// FREEBIE
also change "Take Photo" to "Camera"

fixes signalapp#3819
closes signalapp#3820

// FREEBIE
Also modified text colour in light theme to nicer red

fixes signalapp#3524
Closes signalapp#3806
// FREEBIE
@JavaJens

JavaJens commented Aug 3, 2015

Copy link
Copy Markdown
Owner

Thanks for your continuous effort in merging upstream!

JavaJens added a commit that referenced this pull request Aug 3, 2015
Merge upstream 2.24.0 into Feature/websocket reborn
@JavaJens
JavaJens merged commit febc97a into JavaJens:feature/websocket-reborn Aug 3, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants