5338 Commits

Author SHA1 Message Date
Zixaphir
1c9db7536d Restore ThreadUpdater.count() 2013-10-13 14:44:09 -07:00
Zixaphir
0415de74c1 Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	json/archives.json
	package.json
	src/Archive/Redirect.coffee
	src/General/Build.coffee
	src/General/Config.coffee
	src/General/html/Build/post.html
	src/Monitoring/ThreadUpdater.coffee
	src/Posting/QuickReply.coffee
2013-10-13 14:29:52 -07:00
Zixaphir
38010c0b26 A couple of small things 2013-10-13 13:57:36 -07:00
Zixaphir
91cedb3b89 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	html/General/Settings-section-Rice.html
	img/changelog/3.9.0/0.png
	package.json
	src/Images/AutoGIF.coffee
	src/Images/RevealSpoilers.coffee
	src/Miscellaneous/ExpandComment.coffee
	src/Miscellaneous/IDColor.coffee
	src/Monitoring/Unread.coffee
	src/Posting/QuickReply.coffee
	src/Quotelinks/QuoteInline.coffee
	src/Quotelinks/QuotePreview.coffee
	src/Quotelinks/QuoteYou.coffee
	src/Quotelinks/Quotify.coffee
2013-10-13 13:53:38 -07:00
Mayhem
e0f72db7ec Remove mention of the status link in the settings. #1005 2013-10-08 10:59:28 +02:00
Mayhem
46806d142c Merge pull request #1298 from Wohlfe/patch-1
RIP Foolz A Shit
2013-10-07 22:52:51 -07:00
Wohlfe
8839c928f6 RIP Foolz A Shit 2013-10-07 23:14:48 -04:00
Mayhem
2aec18ab49 Return early. 2013-10-06 21:28:02 +02:00
Mayhem
abdb3acdca Fix #1292. 2013-10-06 15:14:43 +02:00
Mayhem
5d80be015c Don't open the QR post previews list when we drop a single file. Close #1290 2013-10-06 15:07:30 +02:00
Mayhem
1b00985238 Merge pull request #1288 from ihavenoface/v3
Update archives.json.
2013-10-04 03:50:17 -07:00
noface
10f2a58c3e Update archives.json. 2013-10-04 12:11:05 +02:00
seaweedchan
26a0c27ac3 Release 4chan X v1.2.41. 2013-10-03 16:49:16 -07:00
seaweedchan
6cab2cfca7 Fix #194 2013-10-03 16:47:45 -07:00
Mayhem
b1db179af9 Release 4chan X v3.11.5. 2013-10-03 18:13:05 +02:00
Mayhem
6cc8d78a0b Changelog. 2013-10-03 18:12:52 +02:00
Mayhem
f77f70bde3 Add QRPostSuccessful_. #1127 2013-10-03 15:53:03 +02:00
Mayhem
10e93091d7 {Post,Thread}::callbacks => {Post,Thread}.callbacks 2013-10-02 11:38:15 +02:00
Mayhem
1bd09b2270 Update deps. 2013-10-02 11:19:52 +02:00
Mayhem
baf8764375 Merge pull request #1286 from Proplex/new-branch3
Add /con/ support
2013-09-29 22:59:52 -07:00
NemDiggers
1597d9c6ce Add /con/ support 2013-09-29 22:51:03 -04:00
Zixaphir
0935464e05 Just in case 2013-09-24 15:08:38 -07:00
Zixaphir
d2ae42798a Fix seaweedchan/4chan-x#172, fix seaweedchan/4chan-x#190 2013-09-24 15:03:35 -07:00
Zixaphir
5b87c17e69 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	package.json
	src/Archive/Redirect.coffee
2013-09-24 14:33:21 -07:00
Mayhem
f486cf43d5 Release 4chan X v3.11.4. 2013-09-23 14:59:05 +02:00
seaweedchan
c6d5c0c463 Release 4chan X v1.2.40. 2013-09-22 04:45:33 -07:00
seaweedchan
93589e80ef Close #187 2013-09-22 04:40:37 -07:00
seaweedchan
6d4da42eb2 Merge Mayhem X 2013-09-22 03:57:03 -07:00
Jordan Bates
37fde17277 Build and changelog 2013-09-21 10:12:25 -07:00
Mayhem
5b44045d55 Remove foolz+hsts issue workaround. 2013-09-21 13:40:52 +02:00
seaweedchan
d9023a6bf1 Fix #189 2013-09-21 00:15:45 -07:00
seaweedchan
7c9d54792a Update Build.coffee
#190
2013-09-21 00:09:32 -07:00
seaweedchan
a274214c07 Update post.html 2013-09-21 00:05:49 -07:00
Zixaphir
847078db53 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	json/archives.json
	package.json
	src/Filtering/Anonymize.coffee
	src/General/Config.coffee
	src/General/lib/post.class
	src/Linkification/Linkify.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Posting/QuickReply.coffee
2013-09-20 05:45:04 -07:00
Zixaphir
8ba58ee12e Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
2013-09-20 04:45:46 -07:00
Mayhem
acffb4b7de Update deps. 2013-09-20 11:26:46 +02:00
Mayhem
380eda18d2 Don't show the "running low on captchas" when we actually have just enough. 2013-09-20 11:03:18 +02:00
Mayhem
47347d95f5 Posting an image after a reply has no cooldown. 2013-09-20 10:53:42 +02:00
Mayhem
124a2ef473 No need to store hasFile. 2013-09-20 00:01:19 +02:00
Jordan Bates
4ee4856a78 Release 4chan X v1.2.39. 2013-09-19 11:30:50 -07:00
Jordan Bates
2a1368fb80 Fix #185 and #186 2013-09-19 11:28:22 -07:00
Jordan Bates
871dd7582b Release 4chan X v1.2.38. 2013-09-19 07:38:43 -07:00
Jordan Bates
56387a7162 Fix type and build 2013-09-19 07:30:42 -07:00
Jordan Bates
3470929e05 Merge some mayhem changes 2013-09-19 07:27:53 -07:00
Mayhem
3a13d0429c Remove ThreadWatcher conversion from old format. 2013-09-19 15:02:43 +02:00
Mayhem
15a51d2344 Release 4chan X v3.11.3. 2013-09-19 14:22:53 +02:00
Mayhem
7aaa91508c Small cooldown fixes. 2013-09-19 13:53:54 +02:00
Mayhem
5ae957b0e2 Remove capcode replies-related code as it's not relevant anymore. 2013-09-19 11:53:11 +02:00
Mayhem
dcae343687 Remove some sage-related code that is not relevant anymore. 2013-09-19 11:43:50 +02:00
Mayhem
499288e6da Update cooldown counting procedures. 2013-09-19 10:59:38 +02:00