Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge fixes

Browse Source
This commit is contained in:
Jordan Bates 2013-04-26 04:47:11 -07:00
parent 1b9fb32756
commit ad2b22a972
7 changed files with 20 additions and 4476 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -1,4 +1,7 @@
mayhemydg: zixaphir:
- Fix script on Opera
MayhemYDG:
- Minor fixes. - Minor fixes.
- Chrome only: Due to technical limitations, Filter lists and Custom CSS will not by synchronized across devices anymore. - Chrome only: Due to technical limitations, Filter lists and Custom CSS will not by synchronized across devices anymore.

4
LICENSE
View File

@ -4,6 +4,8 @@
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/seaweedchan/4chan-x/blob/master/LICENSE * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE
* *
* Appchan X Copyright © 2013-2013 Zixaphir <zixaphirmoxphar@gmail.com>
* http://zixaphir.github.io/appchan-x/
* 4chan x Copyright © 2009-2011 James Campos <james.r.campos@gmail.com> * 4chan x Copyright © 2009-2011 James Campos <james.r.campos@gmail.com>
* https://github.com/aeosynth/4chan-x * https://github.com/aeosynth/4chan-x
* 4chan x Copyright © 2012-2013 Nicolas Stepien <stepien.nicolas@gmail.com> * 4chan x Copyright © 2012-2013 Nicolas Stepien <stepien.nicolas@gmail.com>
@ -12,6 +14,8 @@
* http://seaweedchan.github.io/4chan-x/ * http://seaweedchan.github.io/4chan-x/
* 4chan x Copyright © 2012-2013 ihavenoface * 4chan x Copyright © 2012-2013 ihavenoface
* http://ihavenoface.github.io/4chan-x/ * http://ihavenoface.github.io/4chan-x/
* 4chan SS Copyright © 2011-2013 Ahodesuka
* https://github.com/ahodesuka/4chan-Style-Script/
* *
* Permission is hereby granted, free of charge, to any person * Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation * obtaining a copy of this software and associated documentation

4
builds/4chan-X.js
View File

@ -23,6 +23,8 @@
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/seaweedchan/4chan-x/blob/master/LICENSE * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE
* *
* Appchan X Copyright © 2013-2013 Zixaphir <zixaphirmoxphar@gmail.com>
* http://zixaphir.github.io/appchan-x/
* 4chan x Copyright © 2009-2011 James Campos <james.r.campos@gmail.com> * 4chan x Copyright © 2009-2011 James Campos <james.r.campos@gmail.com>
* https://github.com/aeosynth/4chan-x * https://github.com/aeosynth/4chan-x
* 4chan x Copyright © 2012-2013 Nicolas Stepien <stepien.nicolas@gmail.com> * 4chan x Copyright © 2012-2013 Nicolas Stepien <stepien.nicolas@gmail.com>
@ -31,6 +33,8 @@
* http://seaweedchan.github.io/4chan-x/ * http://seaweedchan.github.io/4chan-x/
* 4chan x Copyright © 2012-2013 ihavenoface * 4chan x Copyright © 2012-2013 ihavenoface
* http://ihavenoface.github.io/4chan-x/ * http://ihavenoface.github.io/4chan-x/
* 4chan SS Copyright © 2011-2013 Ahodesuka
* https://github.com/ahodesuka/4chan-Style-Script/
* *
* Permission is hereby granted, free of charge, to any person * Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation * obtaining a copy of this software and associated documentation

4
builds/4chan-X.user.js
View File

@ -23,6 +23,8 @@
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/seaweedchan/4chan-x/blob/master/LICENSE * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE
* *
* Appchan X Copyright © 2013-2013 Zixaphir <zixaphirmoxphar@gmail.com>
* http://zixaphir.github.io/appchan-x/
* 4chan x Copyright © 2009-2011 James Campos <james.r.campos@gmail.com> * 4chan x Copyright © 2009-2011 James Campos <james.r.campos@gmail.com>
* https://github.com/aeosynth/4chan-x * https://github.com/aeosynth/4chan-x
* 4chan x Copyright © 2012-2013 Nicolas Stepien <stepien.nicolas@gmail.com> * 4chan x Copyright © 2012-2013 Nicolas Stepien <stepien.nicolas@gmail.com>
@ -31,6 +33,8 @@
* http://seaweedchan.github.io/4chan-x/ * http://seaweedchan.github.io/4chan-x/
* 4chan x Copyright © 2012-2013 ihavenoface * 4chan x Copyright © 2012-2013 ihavenoface
* http://ihavenoface.github.io/4chan-x/ * http://ihavenoface.github.io/4chan-x/
* 4chan SS Copyright © 2011-2013 Ahodesuka
* https://github.com/ahodesuka/4chan-Style-Script/
* *
* Permission is hereby granted, free of charge, to any person * Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation * obtaining a copy of this software and associated documentation

4475
src/features.coffee
View File

File diff suppressed because it is too large Load Diff

BIN
src/img/changelog/3.2.0/0.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 13 KiB

4
src/meta/banner.js
View File

@ -4,6 +4,8 @@
* Licensed under the MIT license. * Licensed under the MIT license.
* <%= meta.repo %>blob/master/LICENSE * <%= meta.repo %>blob/master/LICENSE
* *
* Appchan X Copyright © 2013-2013 Zixaphir <zixaphirmoxphar@gmail.com>
* http://zixaphir.github.io/appchan-x/
* 4chan x Copyright © 2009-2011 James Campos <james.r.campos@gmail.com> * 4chan x Copyright © 2009-2011 James Campos <james.r.campos@gmail.com>
* https://github.com/aeosynth/4chan-x * https://github.com/aeosynth/4chan-x
* 4chan x Copyright © 2012-<%= grunt.template.today('yyyy') %> Nicolas Stepien <stepien.nicolas@gmail.com> * 4chan x Copyright © 2012-<%= grunt.template.today('yyyy') %> Nicolas Stepien <stepien.nicolas@gmail.com>
@ -12,6 +14,8 @@
* http://seaweedchan.github.io/4chan-x/ * http://seaweedchan.github.io/4chan-x/
* 4chan x Copyright © 2012-<%= grunt.template.today('yyyy') %> ihavenoface * 4chan x Copyright © 2012-<%= grunt.template.today('yyyy') %> ihavenoface
* http://ihavenoface.github.io/4chan-x/ * http://ihavenoface.github.io/4chan-x/
* 4chan SS Copyright © 2011-2013 Ahodesuka
* https://github.com/ahodesuka/4chan-Style-Script/
* *
* Permission is hereby granted, free of charge, to any person * Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation * obtaining a copy of this software and associated documentation