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.

Sign up for GitHub

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

Jump to bottom

Chrisaljoudi #2847

Closed
wants to merge 288 commits into from
Closed

Chrisaljoudi #2847

wants to merge 288 commits into from

Conversation

MarcoBey
Copy link

@MarcoBey MarcoBey commented Aug 7, 2017

Mustafa Hasturk and others added 30 commits April 2, 2015 10:08
Merge branch 'master' of github.com:chrisaljoudi/uBlock
e8e5bed
direct translate into tr/messages.json
5146c0f
fix eperimental wiki url
6cce954
fix en/messages.json experimental wiki url
55f311e
fix plural form filter
ac1a0f4
translate 'outdated'
ff2a092
change 'sucgec' to 'filtre'
1b9f1ca
change dynamic filtering url
0b7dbdc
fix dynamic filtering url in en/messages.json
93bae26
change 'suzgec' to 'fltre' and some uBlock typo
bccbc99
direct translation "aboutResetDataButton": into tr/messages.json
ebaa630
typo 'uBlock'
b7c231d
change "settingsAdvancedUserPrompt": url in en/messages.json
22a48b2
fix ublock vs ABP url
c22d5d7
fix malware domains tr/description
9b7ef98
some typo and fix 'destekciler' section
a2530a9
fix Contributors and change log url
72c9a4b
fix 'proje degisiklik gunlugu' url
d51b37c
@AlexVallat
Prevent resetting of block count statistics in the more normal case o…
f280c61 
…f onLocationChange occurring before document-element-inserted
Update messages.json
b0bf3e8 
Corrected links gorhill -> chrisaljoudi
@tailHey
Update messages.json
5df6378
@chrisaljoudi
Update README.md
0083784
Merge branch 'master' of github.com:chrisaljoudi/uBlock
911925c
@AlexVallat
Fix for #1176
a694d1e
@chrisaljoudi
Merge pull request #1179 from AlexVallat/Fix_for_1176
213ab01 
Fix for #1176
@chrisaljoudi
Fix issue template link
2e6388c
@chrisaljoudi
Missed one
4b87c0b
@AlexVallat
Candidate for fix for #1140 as described in #1140 (comment)
bec6e0a
@AlexVallat
Prevent resetting of block count statistics in the more normal case o…
caea8c5 
…f onLocationChange occurring before document-element-inserted
@AlexVallat
Rebasing to merge latest changes
8ea7dc5
chrisaljoudi and others added 27 commits May 16, 2015 18:26
@chrisaljoudi
Safari: cache callback caller
445c565
@chrisaljoudi
Edit dynamic filtering message to make sure users aren't confused
8919ea1
@gorhill
this fixes overlooked code change in 1d3205e
7b652bd
@chrisaljoudi
Merge pull request #1388 from gorhill/chrisaljoudi
0c7b0cc 
this fixes overlooked code change in 1d3205e…
@chrisaljoudi
New dedicated uBlock website
bbf1fb1
@chrisaljoudi
Fixes #1409
dc59aa0
@AlexVallat
Address performance issue reported with large number of open tabs: #266
f959f19 
(maintain reverse lookup map of tabs by tab ID rather than searching through all tabs to find by ID)
@chrisaljoudi
Safari refinements to dynamic filtering UI indicators
6e41dc0
@chrisaljoudi
Close #1421 with 736cb35
a7d2e1e
@chrisaljoudi
Update assets for release
8d0ce5f
@chrisaljoudi
Fixes #1398
51042f8
@chrisaljoudi
Update README.md
dab7aac
@chrisaljoudi
Update README.md
6d942dc
@AlexVallat
Fix for #1437 - support for browsers which don't support getTabForBro…
eb264c6 
…wser
@AlexVallat
Fix for #1448: Raise tab close events for all the tabs of a window wh…
204404d 
…en that window is closed. Made getTabForBrowser robust to being called for orphaned tab browsers.
@AlexVallat
Fix #1449: Drop marker now appears next to rather than under the butt…
c6f5c89 
…on on Linux/PaleMoon
@chrisaljoudi
No more poll
9a0cb5d
@chrisaljoudi
Unbreak floatapp.com
a7c61e9
@publicarray
fix for #1480
3a352a1
@chrisaljoudi
Merge pull request #1499 from publicarray/master
524010d 
fix for #1480
@chrisaljoudi
Fixes #1518
bc11167
@chrisaljoudi
Update assets
3e5d6fb
@chrisaljoudi
New release
4bd9c53
@chrisaljoudi
Fixes #1521
ea03d92
@chrisaljoudi
New release ver.
88fba4a
@chrisaljoudi
Fix Safari update manifest.
df53d14
@chrisaljoudi
Merge pull request #1250 from b3rnd/patch-1
a70a500 
prefer https
@bershan2
Copy link
Contributor

bershan2 commented Aug 7, 2017

@MarcoBey Why are you proposing to merge the Chrisaljoudi's branch? They have separated a while ago and this repository contains numerous updates, fixes, and improvements. They are absolutely incompatible. E.g., .travis.yml contains Chrisaljoudi's key, which would not even allow to publish the release. What is the point of this pull request?

@gorhill gorhill closed this Aug 7, 2017
manoon2410
manoon2410 reviewed Feb 8, 2018
View reviewed changes
Copy link

@manoon2410 manoon2410 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@manoon2410 manoon2410 manoon2410 left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.