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

1.2.4 => master #1407

Merged
merged 38 commits into from Oct 20, 2013
Merged

1.2.4 => master #1407

merged 38 commits into from Oct 20, 2013

Conversation

ghost
Copy link

@ghost ghost commented Oct 20, 2013

#1404 with all conflicts resolved and bugs fixed

git diff 68af6979785ac75cf8439c033aa7b18cc1e21394 faf66ef2c62995becd432f6dd2ea6aac80efbf21

should show differences only in build/

sjinks and others added 30 commits October 10, 2013 07:45
@sjinks
Conditional jump or move depends on uninitialised value(s)
9100e6f
@sjinks
Updated ext/mvc/collection.c
b48d390
@sjinks
Regenerated build/ files
b52d26e
Merge pull request #1360 from sjinks/1.2.4
3d0c48d 
[1.2.4] Fix valgrind errors
@sjinks
Test case for #1364
f31f7e6
@sjinks
Possible fix for #1377
a9e7ba2
@sjinks
Backported regression tests from 1.3.0
9015ce0
@sjinks
Dereference of null pointer in zim_Phalcon_Acl_Adapter_Memory_dropRes…
218af45 
…ourceAccess

Fix #1376
(cherry picked from commit ac556b9)
@sjinks
Fix segfault in Phalcon\Db\Column
5e54bb6
@sjinks
Regenerated build/ files
06748eb
Merge pull request #1378 from sjinks/1.2.4
b4ea33c 
[1.2.4] Backport of bugfixes from 1.3.0
@xboston
Replace Phalcon\Tag:: of ->tag-> service
c470232
Merge pull request #1384 from xboston/tag-volt-1.2.4
5061bdc 
Replace Phalcon\Tag:: of $this->tag-> service in volt template
@sjinks
Fix bugs found by ccc-analyzer
0814d15
@sjinks
More bug fixes
b6c69fb
@sjinks
Test case for #1392
2a6bf5a
@sjinks
Fix #1392
1d40665
@sjinks
[FP] Dereference of null pointer
247cf9b 
(cherry picked from commit 39d25cc)
@sjinks
[FP] Dereference of null pointer
2caf2ba
@sjinks
[FP] Dereference of null pointer
d4fd9d9
@sjinks
Regenerated build/ files
21c712d
@Cinderella-Man
Builder _having patch
b2e3cbe
@sjinks
Fix #1397
3d97044
@sjinks
Test case for #1399
2491233
@sjinks
Test case for #743
71dbb90
@sjinks
Fix #1399
21c5770
@sjinks
Updated changelog
90449a2
@sjinks
Regenerated build/ files
5e27ed2
@sjinks
Test case for #1275
b617bab
@sjinks
Fix #1275
d40c88a
sjinks and others added 8 commits October 19, 2013 20:43
@sjinks
Merge branch '1.2.4-builder-fix' of https://github.com/Cinderella-Man…
f934e66 
…/cphalcon into 1.2.4
@sjinks
Updated CHANGELOG
cd177e4
@sjinks
Regenerated build/ files
9eaa882
@sjinks
Fix controller length for #1275
af6c30b 
(cherry picked from commit a6d8d5903876a6fb9e15bb1cce25a0e5ca442777)

Conflicts:
	ext/mvc/dispatcher.c
@sjinks
Regenerated build/ files
65ba61b
Merge pull request #1393 from sjinks/1.2.4
c0e9480 
[1.2.4] Fix bugs found by static code analyzers
@andresgutierrez
Updating version to 1.2.4 final [ci skip]
faf66ef
@sjinks
Merge remote-tracking branch 'origin/1.2.4'
68af697 
Conflicts:
	CHANGELOG
	build/32bits/phalcon.c
	build/64bits/phalcon.c
	build/safe/phalcon.c
	ext/db/column.c
	ext/mvc/application.c
	ext/mvc/collection.c
	ext/validation/message/group.c
	ext/version.c
@ghost ghost mentioned this pull request Oct 20, 2013
Merged
phalcon pushed a commit that referenced this pull request Oct 20, 2013
Merge pull request #1407 from sjinks/master
644be91 
1.2.4 => master
@phalcon phalcon merged commit 644be91 into phalcon:master Oct 20, 2013
@phalcon
Copy link
Collaborator

phalcon commented Oct 20, 2013

thanks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@phalcon @sjinks @xboston @Cinderella-Man @andresgutierrez