Deleted a forgotten English string in the French translation #1877

Closed
wants to merge 344 commits into
from

Conversation

Projects
None yet
@tantignac

No description provided.

Ryan Thompson and others added some commits Jun 27, 2012

Ryan Thompson
Revert "This was merged..."
This reverts commit 6d56a9b.
Ryan Thompson
Added Filters Feature to Entries_Table Method
Accepts an array in the extra param to show filters, the rest is
handled auto-magically.

'filters'	=> array('status' => array(null => 'Any', 'Complete' =>
'Complete', 'Draft' => 'Draft', 'Sending' => 'Sending'), 'name',
'sender', 'message_subject'),
Fixing library call in Streams Core fields library.
Was causing an error with reCAPTCHA.
Ryan Thompson
Add some delay
This will keep the latter from firing first.
Phil Sturgeon
Don't try to validate a contact form just because the page is post.
By checking for the specific contact form button name it can only run if THAT form was submitted.
Phil Sturgeon
Improved the reset password system to use email OR username, not requ…
…ire both.

It will also actually work now that it no longer requires properties made protected in CI 3.0.
Merge pull request #1561 from gbaldera/2.2/develop
Updated spanish language for groups, pages and search modules
Merge branch '2.1/develop' of github.com:pyrocms/pyrocms into 2.2/dev…
…elop

Conflicts:
	system/cms/themes/pyrocms/css/workless/responsive.css
	system/cms/themes/pyrocms/css/workless/workless.css
Re-instating the 2.2/develop admin theme updates.
This is phase II of fixing the little 2.1/2.2 merge snafu. I merged 2.1/develop into 2.2/develop which wiped out the 2.2/develop admin theme changes. This re-instates them.
@jerel

This comment has been minimized.

Show comment Hide comment
@jerel

jerel Jul 3, 2012

Member

It seems that this commit is what caused the breakage: bcit-ci/CodeIgniter@d261b1e This cleanup of yours fixes it tho, yay

Member

jerel commented on 4894b11 Jul 3, 2012

It seems that this commit is what caused the breakage: bcit-ci/CodeIgniter@d261b1e This cleanup of yours fixes it tho, yay

Phil Sturgeon and others added some commits Jul 3, 2012

ChristianGiupponi and others added some commits Sep 13, 2012

Fixed error in blog posts view
There is a problem with the table of the posts list.
There is an else but no if at the top to check if there are posts in the database.
This fix the problem.
Fixes Issue: #1842 - undefined Group_m::where_in()
Fatal error: Call to undefined method Group_m::where_in() in system/cms/modules/navigation/controllers/admin.php on line 191
Page Layout Events addition
Added 3 new events for Page Layouts: page_layout_created,
page_layout_updated, page_layout_deleted
Bug Fix: Page Layout flashdata not showing number
The Page Layout flashdata message was not showing the page_id correctly
for single and multiple items.
Redirects Events added
Added three new Events to Redirects: redirect_created,
redirect_updated, redirect_deleted.
Phil Sturgeon
Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/dev…
…elop

Conflicts:
	system/cms/language/french/global_lang.php
	system/cms/modules/themes/language/italian/themes_lang.php
Phil Sturgeon
Merge pull request #1848 from ChristianGiupponi/patch-3
Fixed error in blog posts view
Phil Sturgeon
Merge pull request #1851 from ryun/patch-11
Fixes Issue: #1842 - undefined Group_m::where_in()
Fixes an issue with invalid users in streams_core
When the user field type was retrieving a user it presumed that it was
found and attempted to return the data, this simply puts in a check that
data was found and returns false if not.
Merge pull request #1862 from firesale/2.2/develop
Fixes an issue with invalid users in streams_core
Merge pull request #1758 from RyanThompson/patch-4
Have to use $stream_fields here.
@jeroenvheel

This comment has been minimized.

Show comment Hide comment
@jeroenvheel

jeroenvheel Sep 19, 2012

if this padding is set to 19px it looks better !

if this padding is set to 19px it looks better !

This comment has been minimized.

Show comment Hide comment
@scottparry

scottparry Sep 19, 2012

Pull request then :D

Pull request then :D

This comment has been minimized.

Show comment Hide comment
@jeroenvheel

jeroenvheel Sep 19, 2012

Done :P

Done :P

@philsturgeon

This comment has been minimized.

Show comment Hide comment
@philsturgeon

philsturgeon Sep 19, 2012

Member

Thanks for pointing this out! A bunch of other changes got mixed up, I think you accidentally send 2.2/develop to 2.1/develop, but never mind - its fixed :)

Member

philsturgeon commented Sep 19, 2012

Thanks for pointing this out! A bunch of other changes got mixed up, I think you accidentally send 2.2/develop to 2.1/develop, but never mind - its fixed :)

@tantignac

This comment has been minimized.

Show comment Hide comment
@tantignac

tantignac Sep 19, 2012

Ok, sorry about that. I didn't know which version (2.1 or 2.2) to choose for the pull request and I thought I forked the 2.1.

Ok, sorry about that. I didn't know which version (2.1 or 2.2) to choose for the pull request and I thought I forked the 2.1.

@RyanThompson

This comment has been minimized.

Show comment Hide comment
@RyanThompson

RyanThompson Sep 29, 2012

Member

@ikreativ - Hey man, there were two other files (tabbed_forms.php and filters.php) in the partials views that must have not been in your repo. They got wiped so I re-added em. They will still need you to touch them regarding the redesign.

Member

RyanThompson commented on 3dc58a5 Sep 29, 2012

@ikreativ - Hey man, there were two other files (tabbed_forms.php and filters.php) in the partials views that must have not been in your repo. They got wiped so I re-added em. They will still need you to touch them regarding the redesign.

@RaveX

This comment has been minimized.

Show comment Hide comment
@RaveX

RaveX Oct 17, 2012

I'm running 2.1.4 and I replaced this fix with the current file.

On page 2, it says there are no fields...with a link to add some custom fields.

Do I need to do anything else to make the fix work? Or is not quite working as intended?

RaveX commented on bf50f41 Oct 17, 2012

I'm running 2.1.4 and I replaced this fix with the current file.

On page 2, it says there are no fields...with a link to add some custom fields.

Do I need to do anything else to make the fix work? Or is not quite working as intended?

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