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

Merge Zixaphir X

Browse Source
This commit is contained in:
Jordan 2014-01-09 17:42:57 -07:00
parent de5d903e46
commit 436e138895
4 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CHANGELOG.md
View File

@ -1,7 +1,3 @@
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5682df5a2a366e5c5f4362395574179a2de68bb9
**MayhemYDG**: **MayhemYDG**:
- **New option**: `Auto-hide header on scroll`. - **New option**: `Auto-hide header on scroll`.
- Added support for `4cdn.org`. - Added support for `4cdn.org`.
@ -50,13 +46,8 @@
**Zixaphir**: **Zixaphir**:
- FappeTyme and WerkTyme now persist across sessions. - FappeTyme and WerkTyme now persist across sessions.
<<<<<<< HEAD
=======
=======
- Various fixes and improvements for the JSONified index - Various fixes and improvements for the JSONified index
>>>>>>> 5682df5a2a366e5c5f4362395574179a2de68bb9
### v1.2.45 ### v1.2.45
*2014-01-07* *2014-01-07*
@ -67,10 +58,6 @@
**Zixaphir**: **Zixaphir**:
- Fix optional increase for thread updater - Fix optional increase for thread updater
<<<<<<< HEAD
>>>>>>> 08ae1daee8d4a2dfa272b00a62f78aa56092dfd4
=======
>>>>>>> 5682df5a2a366e5c5f4362395574179a2de68bb9
### v1.2.44 ### v1.2.44
*2013-12-06* *2013-12-06*

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

File diff suppressed because one or more lines are too long

2
builds/crx/script.js
View File

File diff suppressed because one or more lines are too long

19
src/General/css/font-awesome.css vendored
View File

File diff suppressed because one or more lines are too long