Skip to content
This repository has been archived by the owner on Jan 8, 2020. It is now read-only.

Adding warning namespace #4836

Merged
merged 179 commits into from
Jul 17, 2013
Merged

Adding warning namespace #4836

merged 179 commits into from
Jul 17, 2013

Conversation

e-belair
Copy link
Contributor

warning namespace is often used.
Also sxBootstrap need this namespace (better than override the plugin)

Tom Shaw and others added 30 commits April 28, 2013 16:07
Add router key to pages & add isActive method to Nav Uri.
ca32784
Nav factory recomended request object inject switch.
9bd6f50
Minor textual fixes.
2bbea55
Testing request get path method.
197f9a6
Added unit test if uri returns active on match.
31a1f79
Removing test setup not needed and soft tab method.
4ee51b2
Only add request object if has uri.
33e501f
If statement spacing.
da4ecfe
Change test name.
6705b52
Test if page contains correct request instance.
56c390a
Non matching uri test added.
dd03688
Recomended formatting fixes.
6ae5b18
Added a soft dependency on request object in isActive method.
ca5988b
Formatting fixes.
aadc5d5
@noopable
Add test FormElementManager takes creationOptions
abf14ab
@noopable
Fix FormElementManager can't get the 2nd parameter to instantiate
d7fdc9b
add flag for fallback value
dc8748d
data provider is not static
772356f
add assert
09bde6f
@leodido
fixed signature of loadConstraintReferences zendframework#4438
aaa30ed
@weierophinney
Merge branch 'hotfix/4447' into develop
4061451 
Close zendframework#4447
@mtymek
extracted route matcher into separate class
105c804
@mtymek
refactored unit tests
c2a67db
@mtymek
Renamed to "ConsoleRouteMatcher"
9937784
@mtymek
CS
add2a1f
@weierophinney
Merge branch 'hotfix/4431' into develop
a72f163 
Forward port zendframework#4431
PR zendframework#4439
76d3723 
Merge branch 'hotfix/4438' of git://github.com/leodido/zf2 into leodido-hotfix/4438
@mtymek
protected visibility
f8d0c76
Forward zendframework#4439
fc735bc 
Merge branch 'leodido-hotfix/4438' into develop
@mtymek
updated docblocks and comments
acc4f06
weierophinney and others added 18 commits June 11, 2013 16:05
@weierophinney
Merge branch 'hotfix/4465' into develop
6d01ad2 
Forward port zendframework#4465
@DASPRiD
Merge branch 'pull/4622' into develop
5310b89 
Forward port zendframework#4622
@weierophinney
Merge branch 'hotfix/4618' into develop
c926035 
Forward port zendframework#4618
@weierophinney
Merge branch 'hotfix/4632' into develop
f9c443b 
Forward port zendframework#4632
@weierophinney
Merge branch 'hotfix/4634' into develop
003eed2 
Forward port zendframework#4634
@weierophinney
Merge branch 'hotfix/4636' into develop
7758145 
Forward port zendframework#4636
@ezimuel
Merge branch 'marc-mabe-hotfix/3512' into develop
f3a10da
Merge branch 'hotfix/4630' into develop
e911436 
Forward port zendframework#4630
Merge branch 'hotfix/4624' into develop
a25de75 
Forward port zendframework#4624
Merge branch 'hotfix/4629' into develop
44b73b0 
Forward port zendframework#4629
@EvanDotPro
Merge branch 'hotfix/paginator-db-count-subselect' of https://github.…
462d3c4 
…com/ralphschindler/zf2 into develop

PR zendframework#4641
Closes zendframework#4590
Closes zendframework#3647
@weierophinney
Merge branch 'version/bump' into develop
cb09bac 
Bump to next dev version

Conflicts:
	README.md
	library/Zend/Version/Version.php
Merge branch 'hotfix/4652' into develop
850ae47 
Forward port zendframework#4652
Merge branch 'hotfix/4665' into develop
d179b1e 
Forward Port zendframework#4665
Merge branch 'hotfix/4646' into develop
1372ad5 
Forward Port zendframework#4646
Merge branch 'hotfix/4644' into develop
99cda48 
Forward port zendframework#4644
Merge branch 'hotfix/4631' into develop
b0dfecb 
Forward port zendframework#4631
@e-belair
Merge branch 'flash-warning' into develop
6216c0d
@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling 6216c0d on manuscle:develop into 2c6f269 on zendframework:develop.

1 similar comment
@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling 6216c0d on manuscle:develop into 2c6f269 on zendframework:develop.

@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling 9ffb5ca on manuscle:develop into 2c6f269 on zendframework:develop.

@ghost ghost assigned weierophinney Jul 17, 2013
weierophinney added a commit that referenced this pull request Jul 17, 2013
@weierophinney
Merge pull request #4836 from manuscle/develop
fed51e3 
Adding warning namespace
weierophinney added a commit that referenced this pull request Jul 17, 2013
@weierophinney
Merge branch 'feature/4836' into develop
a462a5b 
Close #4836
@weierophinney weierophinney merged commit 9ffb5ca into zendframework:develop Jul 17, 2013
This was referenced Feb 16, 2014
Closed
Merged
weierophinney added a commit to zendframework/zend-view that referenced this pull request May 15, 2015
@weierophinney
Merge pull request zendframework/zendframework#4836 from manuscle/dev…
4691db1 
…elop

Adding warning namespace
weierophinney added a commit to zendframework/zend-view that referenced this pull request May 15, 2015
@weierophinney
Merge branch 'feature/4836' into develop
d144ca1 
Close zendframework/zendframework#4836
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees

@weierophinney weierophinney

Labels
None yet
Projects
None yet
Milestone
2.3.0
Development

Successfully merging this pull request may close these issues.