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

7059 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brandon
3d4e0338fe Zixa making fun of me 2014-04-02 20:58:46 -07:00
Brandon
541c8270ea More magic happens to the tabbed slideup 2014-04-02 20:52:12 -07:00
Brandon
dd8ba9f6b1 slideup fixup 2014-04-02 20:49:25 -07:00
Brandon
fd840d822c QR Slideup and Tabbed Slideup 
* upstream/master:
  move that where it belongs
  fix uploading swfs on /f/
  Release appchan x v2.9.10.
  Release 4chan X v3.19.5.
  Fix captchas, again. #1531
  Lets just build that so that we don't have to do so many logic checks
  Lets pretend we're smarter than we really are!

Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-04-02 20:12:35 -07:00
Zixaphir
1f9d5e2221 Merge branch 'v3' 
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-04-02 19:17:49 -07:00
Brandon
9c11798308 move that where it belongs 
Conflicts:
	builds/4chan-X.user.js
	builds/crx/script.js
 2014-04-02 19:17:19 -07:00
Brandon
0d34429ee0 fix uploading swfs on /f/ 
Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
 2014-04-02 19:16:51 -07:00
Zixaphir
66582d5ce9 Release appchan x v2.9.10. 2014-04-02 17:21:38 -07:00
Zixaphir
9f7026e419 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/Posting/QR.captcha.coffee
 2014-04-02 17:21:16 -07:00
Zixaphir
8f62341949 Merge branch 'mayhem' into v3 
Conflicts:
	CHANGELOG.md
	package.json
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
 2014-04-02 17:12:15 -07:00
Mayhem
a4bd81de54 Release 4chan X v3.19.5. 2014-04-03 01:47:47 +02:00
Mayhem
7bc7aed998 Fix captchas, again. #1531 2014-04-03 01:47:38 +02:00
Zixaphir
bbc8899cf1 Lets just build that so that we don't have to do so many logic checks 2014-03-30 18:24:42 -07:00
Zixaphir
393eb3ec22 Lets pretend we're smarter than we really are! 2014-03-30 16:53:08 -07:00
Zixaphir
36aac79a2b Release appchan x v2.9.9. 2014-03-27 13:55:24 -07:00
Zixaphir
df2a5f3fc0 Merge branch 'v3' 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-03-27 13:55:02 -07:00
Zixaphir
af9e544141 Corrections 2014-03-27 13:53:21 -07:00
Zixaphir
cefb710c04 Merge branch 'mayhem' into v3 
Conflicts:
	CHANGELOG.md
	css/style.css
	package.json
	src/General/Header.coffee
 2014-03-27 13:50:02 -07:00
Mayhem
c5dfd248e6 Release 4chan X v3.19.4. 2014-03-27 21:31:58 +01:00
Mayhem
825236a002 Fix #1524. 2014-03-27 21:31:16 +01:00
Zixaphir
b093395413 Release appchan x v2.9.8. 2014-03-26 15:33:28 -07:00
Zixaphir
34dd4ba96a Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
 2014-03-26 15:32:57 -07:00
Zixaphir
1afcdd011c Improve Scroll to Post Quoting You logic 2014-03-26 15:31:26 -07:00
Zixaphir
0ad639c4a9 Merge branch 'v3' 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-03-26 15:21:29 -07:00
Zixaphir
f6ea1ed52c Don't clean empty data. 2014-03-26 11:16:05 -07:00
Zixaphir
8b68243650 Merge branch 'v3' 2014-03-24 13:34:50 -07:00
Zixaphir
04f5f5a5fb Oops 2014-03-24 13:34:40 -07:00
Zixaphir
854c588820 Merge branch 'v3' 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-03-24 13:31:42 -07:00
Zixaphir
148edd3e33 Restore Scroll To Post Quoting You functionality. 2014-03-24 13:29:09 -07:00
Zixaphir
53db0118a3 Compact File Text 2014-03-23 18:41:26 -07:00
Zixaphir
fe7d37196f Merge branch 'v3' 
Also add Backlink Icons from OneeChan

Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-03-23 18:25:34 -07:00
Zixaphir
e20a822481 Since we already are generating keys, lets use them. 2014-03-23 17:46:21 -07:00
Zixaphir
642b1cd37d Small Linkifier miss involving hostname.com:port 2014-03-23 17:19:19 -07:00
Zixaphir
528e5667ef Merge branch 'v3' 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-03-23 14:33:16 -07:00
Zixaphir
2da04a635b Thread Updater Increment issue. 2014-03-23 14:28:42 -07:00
Zixaphir
55e43147ed Redundant 2014-03-23 12:32:40 -07:00
Zixaphir
228eba30fb Fuck protocols. 
Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
 2014-03-22 12:33:52 -07:00
Zixaphir
5e21c32a4a Fuck protocols. 2014-03-22 12:32:06 -07:00
Zixaphir
7aafc89cb8 Merge branch 'v3' 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-03-21 16:36:41 -07:00
Zixaphir
4c09eed4cd Holy shit loops 2014-03-21 16:35:27 -07:00
Zixaphir
1b5095ac24 Release appchan x v2.9.7. 2014-03-20 15:21:24 -07:00
Zixaphir
4c52d0ee05 comments 2014-03-20 15:19:24 -07:00
Zixaphir
2ac35d9fc8 Move userMascots and userThemes out of Sync storage. 
lelwat
 2014-03-20 11:17:17 -07:00
Zixaphir
d495c74aef Eliminate a worthless console error 2014-03-20 10:04:10 -07:00
Zixaphir
d45f737603 Merge branch 'v3' 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Main.coffee
	src/General/Navigate.coffee
	src/Linkification/Linkify.coffee
 2014-03-20 09:57:27 -07:00
Zixaphir
282a2338d8 One more thing from master branch 2014-03-20 09:55:32 -07:00
Zixaphir
c45807c9b9 Small backlink reflow 2014-03-20 09:42:48 -07:00
Zixaphir
18db3994b6 Backport fixes from master branch 2014-03-20 09:37:27 -07:00
Zixaphir
3b611160ac Eliminate title cacheing for the time being. 
Causing too many problems.
Also attempt to optimize Linkify.
 2014-03-20 09:03:56 -07:00
Mayhem
2930df7098 Release 4chan X v3.19.3. 2014-03-20 16:33:49 +01:00