23 Commits

Author	SHA1	Message	Date
Miguel Jacq	3a7ae401af	Fix conflicts	2018-09-16 13:37:22 +10:00
Miguel Jacq	8bb75cc530	Fix conflict in tests	2018-09-15 12:07:01 +10:00
Micah Lee	8312058fcc	Merge branch 'develop' into receiver-mode-gui	2018-09-14 18:59:36 -07:00
Miguel Jacq	16430f5fad	Fix tests	2018-08-22 11:50:16 +10:00
Miguel Jacq	a13e98d7bb	Fix tests for public_mode	2018-07-22 14:58:14 +10:00
Miguel Jacq	a830eb57fe	#691 remove meek_lite Amazon	2018-07-21 15:52:11 +10:00
Micah Lee	1ad68c46d4	Merge branch 'license' into develop	2018-06-18 19:29:03 -07:00
Micah Lee	9344fbd274	Update OnionShare copyright year to 2018	2018-06-17 16:53:44 -07:00
Micah Lee	73efcf81fc	Fix test from adding new settings	2018-04-29 16:47:36 -07:00
Micah Lee	b6b61f753d	Update GPL copyright year	2018-04-24 10:07:59 -07:00
Micah Lee	2ee7e74236	Remove the desktop notification setting -- everyone gets them now	2018-04-24 09:26:06 -07:00
Micah Lee	c2fecf8aa4	Fix tests after refactoring Common	2018-03-13 02:22:26 -07:00
Micah Lee	50409167d4	Completely refactor common to make a Common class, and pass that class down into all parts of the program	2018-03-08 10:18:31 -08:00
Micah Lee	2e31db8543	Fix settings test because I moved the default downloads dir	2018-03-08 05:43:45 -08:00
Micah Lee	08957c5145	Fix settings test to account for new downloads_dir setting	2018-03-05 08:54:20 -08:00
Miguel Jacq	dface51dd0	Merge pull request #588 from micahflee/ux-update ... Major user experience update	2018-02-25 08:27:46 +11:00
irykoon	b2c310f2e0	Support meek_lite Pluggable Transport ... Currently, meek/meek_lite is one of the few, if not only, mature pluggable transport that works in some heavily cenosored areas, for example, China. Therefore, this can be a nice feature to have.	2018-02-15 23:19:53 +00:00
Micah Lee	af1b56e659	Fix settings test, because of adding a new setting	2018-02-07 10:54:53 -08:00
Miguel Jacq	76cf0ae107	Fix conflicts arising from the reuse_private_key branch	2018-01-16 15:30:36 +11:00
Miguel Jacq	3e7d4c64ff	Save the slug when using a persistent private key	2018-01-15 10:01:34 +11:00
Miguel Jacq	488d88886d	Attempt to fix tests	2018-01-13 21:03:44 +11:00
Miguel Jacq	304059ddaa	fix tests for bridge support	2017-12-11 16:28:53 +11:00
Micah Lee	21e1dac2c3	Rename test files to have test_ prefix	2017-11-20 15:52:33 -08:00