5369 Commits

Author SHA1 Message Date
Jordan
4735b8dae5 Update for 4cdn, maybe fix issues like #219? 2014-01-07 02:27:40 -07:00
Jordan
bfa4a65b68 Update archives 2014-01-07 02:08:01 -07:00
Jordan
4d3195bbb9 Update font-awesome 2014-01-07 02:00:47 -07:00
Jordan Bates
4fd8e6a4bf Release 4chan X v1.2.44. 2013-12-06 17:11:47 -07:00
Jordan Bates
382943a266 Cooldown fix, from Mayhem 2013-12-06 17:09:57 -07:00
Jordan Bates
16fc57ca2d Merge mayhems fix for #214 2013-12-06 17:02:56 -07:00
Jordan Bates
16e2afa916 Update for moot's markup change, close #213 2013-12-06 16:57:35 -07:00
Jordan Bates
b9a0d453db Release 4chan X v1.2.43. 2013-11-10 23:36:52 -07:00
Jordan Bates
2094164ff3 Strawpoll embedding, close #206 2013-11-10 23:35:32 -07:00
Jordan Bates
528f95d5f5 Release 4chan X v1.2.42. 2013-10-22 18:27:12 -07:00
Jordan Bates
4d1f697fc5 Merge branch 'v3' of https://github.com/zixaphir/appchan-x 2013-10-22 17:46:33 -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
Jordan Bates
1e9111ec99 Merge Zixaphir X 2013-10-19 22:16:09 -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
0c80dfff22 Changelog 2013-10-19 19:48:38 -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
seaweedchan
218374e74b Merge pull request #199 from Ant59/master
Added elementary icon to emoji
2013-10-19 00:04:57 -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
Mayhem
aae051b62e Merge pull request #1304 from Proplex/upstream
Add /adv/ and /trv/ support
2013-10-15 16:11:20 -07:00
NemDiggers
4023470147 Add even more boards 2013-10-15 18:57:47 -04:00
NemDiggers
064b6ce516 Add /adv/ and /trv/ support
DOES IT EVER STOP?
2013-10-15 18:30:36 -04:00
Antony Derham
8aa07dba3e Added elementary icon to emoji 2013-10-15 15:40:25 +01:00
Mayhem
5eee4a1146 Close #1301. 2013-10-15 13:42:52 +02:00
Mayhem
a064090ee3 Remove archive redirection for /q/ and /con/. 2013-10-15 11:38:45 +02:00
Mayhem
642ab465af Merge pull request #1302 from Proplex/v3
Add /d/ /pol/ and /s4s/ support.
2013-10-13 22:46:01 -07:00
NemDiggers
ce96d358e4 Add /d/ /pol/ and /s4s/ support.
Trying to pick up the boards foolzashit left behind.
2013-10-13 23:43:27 -04: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
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