58 Commits

Author SHA1 Message Date
Zixaphir
16b35dffce Merge branch 'v3'
Conflicts:
	.gitignore
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Config.coffee
	src/General/Globals.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/UI.coffee
	src/General/css/style.css
	src/General/meta/manifest.json
	src/Posting/QuickReply.coffee
2013-07-21 09:01:27 -07:00
Zixaphir
d2bcf840ff Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	src/Archive/Redirect.coffee
2013-07-21 08:43:58 -07:00
Zixaphir
582d067a10 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	CONTRIBUTING.md
	Gruntfile.js
	README.md
	changelog-old
	css/style.css
	html/Monitoring/ThreadStats.html
	html/Posting/QR.html
	json/archives.json
	package.json
	src/Archive/Redirect.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/UI.coffee
	src/General/html/Settings/Filter-guide.html
	src/General/lib/$.coffee
	src/General/lib/clone.class
	src/General/lib/post.class
	src/Images/ImageHover.coffee
	src/Menu/Menu.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Posting/QuickReply.coffee
	src/Quotelinks/QuotePreview.coffee
	src/Quotelinks/Quotify.coffee
2013-07-21 08:39:40 -07:00
Mayhem
33d3518e76 "id" -> "ID" in dataset suffixes. 2013-07-14 19:03:22 +02:00
Mayhem
ddbec61e1b Use dataset setters instead of setAttribute. 2013-07-14 18:51:02 +02:00
Jordan Bates
9ba459ea8a Release 4chan X v1.2.19. 2013-07-14 03:58:01 -07:00
Mayhem
1412fca138 Element #apply-css doesn't exist in the document when opening via Edit custom board navigation. 2013-06-21 20:10:18 +02:00
Zixaphir
283a33c443 A lot of backpedaling here. 2013-06-20 19:20:32 -07:00
Zixaphir
191aec36ad Rethink Emoji. 2013-06-06 07:19:46 -07:00
Zixaphir
a2ceddb03b Rethink the #main-menu and settings icons in general 2013-06-02 17:36:15 -07:00
Zixaphir
c9b7ba0962 cleaner return 2 2013-06-01 06:29:17 -07:00
Zixaphir
04efddaa9b Redo mascot positioning to be less dumb. 2013-05-31 20:44:03 -07:00
Zixaphir
8144b38023 Rethink some mascot options. 2013-05-31 19:09:24 -07:00
Zixaphir
271aeb9bf7 Yeah, this will probably break a lot... 2013-05-31 16:55:30 -07:00
Zixaphir
c56470ee28 This will do until I feel like putting some polish into this. 2013-05-31 08:21:20 -07:00
Zixaphir
ab630bd21d This is going to take awhile. 2013-05-30 14:42:21 -07:00
Zixaphir
f2766c55a4 dem classes. 2013-05-30 13:15:33 -07:00
Zixaphir
e93a249e4b Redo mascot exporting. 2013-05-28 05:34:14 -07:00
Zixaphir
7809ca0fe3 Basically redo theme importing. 2013-05-28 05:15:58 -07:00
Zixaphir
ca4be499a3 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Main.coffee
	src/General/css/style.css
2013-05-27 14:22:31 -07:00
Jordan Bates
745e5bd197 Fire OpenSettings event on settings/section creation 2013-05-27 01:04:34 -07:00
Zixaphir
70d1d758ec Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Main.coffee
	src/General/css/style.css
	src/Posting/QuickReply.coffee
2013-05-15 09:00:09 -07:00
Jordan Bates
f4db0a60ff Merge Mayhem X 2013-05-14 13:32:43 -07:00
Zixaphir
4b8b9ad493 Merge branch 'v3'
Conflicts:
	builds/4chan-X.js
	builds/4chan-X.user.js
	src/General/Settings.coffee
2013-05-14 13:15:39 -07:00
Zixaphir
57f37a3811 oops. 2013-05-14 12:25:58 -07:00
Zixaphir
86b5b0931c *yawn* 2013-05-14 12:19:07 -07:00
Zixaphir
1debf61f2e Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/css/burichan.css
	src/General/css/futaba.css
	src/General/css/photon.css
	src/General/css/style.css
	src/General/css/tomorrow.css
	src/General/css/yotsuba-b.css
	src/General/css/yotsuba.css
	src/General/html/Settings/Advanced.html
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadWatcher.coffee
2013-05-14 11:40:38 -07:00
Zixaphir
1bb474d28f Add board selection to the archive selection.
Close seaweedchan/issues/80
2013-05-14 09:40:50 -07:00
Jordan Bates
f4e3629b4c Remove Archive section, put back into Advanced 2013-05-13 07:17:19 -07:00
Mayhem
e9b8db87d8 Add a button to update the archive list. Also display the last update time. 2013-05-13 00:21:12 +02:00
Mayhem
5267b93317 Don't export archives. 2013-05-12 23:16:03 +02:00
Zixaphir
249a739bfc Add @MayhemYDG's archive redirection 2013-05-12 09:00:00 -07:00
Zixaphir
0c8a7bf29d Fix settings importing. 2013-05-10 22:49:59 -07:00
Jordan Bates
3315a244dc Set lastchecked instead of lastupdate 2013-05-10 16:58:29 -07:00
Zixaphir
e37417481e Workaround for old sauce configurations. 2013-05-10 13:43:58 -07:00
Zixaphir
31c3af58aa Some rethinking of how to handle theme and mascots sections. 2013-05-09 00:46:12 -07:00
Zixaphir
4d365b825d Fix FappeTyme always enabled. 2013-05-08 06:06:57 -07:00
Zixaphir
a87ec3a060 More or less improve the mascot section code. 2013-05-08 05:35:52 -07:00
Zixaphir
6c4e4b6b9f Fix various settings tabs and dialogs
* Delete / Undelete Themes and Mascots
* Themes only add [custom] if they're not already User Themes
2013-05-08 04:48:23 -07:00
Zixaphir
c40b978e1f Inherited indices too stronk 2013-05-07 23:54:46 -07:00
Zixaphir
93b94ec9d0 Merge branch 'v3' into Av2
Conflicts:
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	builds/version
	package.json
	src/General/Main.coffee
	src/General/css/style.css
	src/Posting/QuickReply.coffee
	src/Quotelinks/QuoteInline.coffee
2013-05-06 16:54:39 -07:00
Mayhem
39c3d35a72 Update archived boards list every 4 days. 2013-05-06 21:53:57 +02:00
Jordan Bates
b63e0b9a3f Remove unscroll 2013-05-06 01:26:47 -07:00
Zixaphir
537913542a Fix user css
https://github.com/seaweedchan/4chan-x/issues/51
2013-05-05 22:23:06 -07:00
Mayhem
538e117746 Add archive selection. 2013-05-06 06:57:29 +02:00
Zixaphir
cffd5c56dd Fix #226 2013-05-03 09:24:21 -07:00
Zixaphir
ee00d5a3aa Merge branch 'v3' into Av2
Conflicts:
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	package.json
	src/General/Main.coffee
	src/General/css/style.css
	src/General/html/Features/QuickReply.html
	src/Posting/QuickReply.coffee
2013-05-03 07:17:59 -07:00
Mayhem
370b6ec399 Remove that tmp fix. 2013-05-02 20:12:47 +02:00
Jordan Bates
81d65cc3ca QR doesn't need its own settings section 2013-05-01 02:46:29 -07:00
Mayhem
9183ca0b6a Quick Reply Personas! #330. 2013-05-01 00:28:54 +02:00