Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

看里面,加了规则 & 改核心 #22

Merged
merged 2 commits into from
Nov 26, 2014
Merged

看里面,加了规则 & 改核心 #22

merged 2 commits into from
Nov 26, 2014

Conversation

jixunmoe
Copy link
Contributor

[核心] Ajax 请求允许 POST 提交数据。
[核心] 添加规则初始化函数 fInit
[规则] 添加妙笔阁,论坛请求
[规则] 添加乐文小说网。

[CORE] Add custom init function for site, `fInit`.
[RULE] Add miaobige.com, reported from `https://greasyfork.org/en/forum/discussion/2265`
ywzhaiqi added a commit that referenced this pull request Nov 26, 2014
看里面,加了规则 & 改核心
@ywzhaiqi ywzhaiqi merged commit 75be06a into ywzhaiqi:master Nov 26, 2014
@ywzhaiqi
Copy link
Owner

对 git 不熟悉,冲突都不知道怎么处理。我本地存在未 commit 的修改,在 github 网站上直接合并了,结果 pull 下来自动合并失败。搞了半天,结果在 History for userscript / MyNovelReader 没有你的记录了。。。

@jixunmoe
Copy link
Contributor Author

http://stackoverflow.com/a/3042706
然后 git -f push (没记错的话

On 2014年11月26日 週三 04:29 ywzhaiqi notifications@github.com wrote:

对 git 不熟悉,冲突都不知道怎么处理。我本地存在未 commit 的修改,在 github 网站上直接合并了,结果 pull
下来自动合并失败。搞了半天,结果在 History for userscript / MyNovelReader
https://github.com/ywzhaiqi/userscript/commits/master/MyNovelReader
没有你的记录了。。。


Reply to this email directly or view it on GitHub
#22 (comment).

@ywzhaiqi
Copy link
Owner

主要是去研究 git 太麻烦了,我就用用 git 最简单的功能。

@jixunmoe
Copy link
Contributor Author

那就这样吧 反正之前的 commit 有我的名(

@vokins
Copy link

vokins commented Dec 15, 2014

妙笔阁的新地址改了
http://www.miaobige.com/read/2722/1949903.html
之前匹配的是:
// @include http://www.miaobige.com/book/*/*.html
改成这样的吧?
// @include http://www.miaobige.com/*/*/*.html

@ywzhaiqi
Copy link
Owner

@vokins 已修正

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants