Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,361 Commits 2 Branches 0 Tags
Commit Graph

1398 Commits

Author SHA1 Message Date
Jordan Bates
2094164ff3 Strawpoll embedding, close #206 2013-11-10 23:35:32 -07:00
Zixaphir
739bd5d1ef Fix Infinite Scrolling on Chrome. 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
 2013-10-20 00:21:15 -07:00
Zixaphir
711e22f831 Be a bit closer to Mayhem's structure for the archives 2013-10-19 22:54:40 -07:00
Zixaphir
d38380254c Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3 2013-10-19 19:48:54 -07:00
Zixaphir
71f4bbc4de softTask optimizations. 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
 2013-10-19 19:46:26 -07:00
Zixaphir
4f50fd300d Infinite Scrolling 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Main.coffee
 2013-10-19 19:45:35 -07:00
Zixaphir
9fb8ab50e1 MediaCrush embedding (the right way?) 2013-10-16 14:31:18 -07:00
Zixaphir
6f6766b9a0 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 
Conflicts:
	html/General/Settings-section-Rice.html

Also renamed ColorUserIDs.coffee to IDColor.coffee to better handle
IDColor conflicts between Mayhem's repo and ours
 2013-10-16 13:53:47 -07:00
Antony Derham
8aa07dba3e Added elementary icon to emoji 2013-10-15 15:40:25 +01:00
Zixaphir
078869679b ThreadUpdater 2013-10-13 17:32:45 -07:00
Zixaphir
d2af181dea I removed autoUpdate 2013-10-13 14:48:43 -07:00
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
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
seaweedchan
6cab2cfca7 Fix #194 2013-10-03 16:47:45 -07: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
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
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
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
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
2a1368fb80 Fix #185 and #186 2013-09-19 11:28:22 -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
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
Mayhem
a56b6765cb Remove some /q/-only settings. 2013-09-19 09:22:24 +02:00
Mayhem
6a710cbf0e Fix quotifying link hrefs in certain cases. 
That's a 5 months old bug that didn't seem to affect anyone...
 2013-09-18 00:30:13 +02:00
Mayhem
641de541b4 Thread creation cooldown duration is 600 seconds. 2013-09-17 09:48:58 +02:00
Mayhem
d3654f9079 Update post/delete cooldown timers. 2013-09-17 09:46:02 +02:00
Mayhem
f606b5fbd5 Remember the flag selection. Close #1270 2013-09-13 17:03:42 +02:00
Mayhem
1208e96233 Add support for the flag selector on /pol/. #1270 2013-09-13 16:41:18 +02:00
Jordan Bates
85afe58c62 Close #172 2013-09-12 16:37:00 -07:00