Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: pyrocms/pyrocms
...
head fork: pyrocms/pyrocms
Checking mergeability… Don't worry, you can still create the pull request.
This comparison is big! We're only showing the most recent 250 commits
Commits on Jul 27, 2012
@jerel jerel Cleaned up the blog categories model a little baba4ac
@jerel jerel Removed another errant migration that made it in from 2.2/develop b57ee02
@jerel jerel Added CSRF config edit to the installer config file 0cf34bf
@jerel jerel Had to fix earlier order of migrations to keep live sites from being …
…broken on upgrade.

Here's the deal: v2.1.2 shipped with 092_Fix_user_group.php. Somehow 092 got moved
to 094 and 092 became 092_Add_blog_preview.php. This would obviously break live sites
31c5fae
@jerel jerel Removed unused image field on blog form and fixed the image insertion…
… on the Intro WYSIWYG

NOTICE: there's no way for the WYSIWYG changes to be made via migration without
possibly overwriting somebody's customized config. The fix for running sites is simply
to copy the middle configuration in CP > Settings > WYSIWYG and move it to the
top. In other words copy the blog config and paste it above the regular wysiwyg-simple
config. Evidentally the latest version of jQuery instantiates
the WYSIWYG editor on the first match instead of the strictest match as this
worked perfectly when it was first released. Fixes #1497
c6eb7ce
@jerel jerel Merge pull request #1640 from F2KDev/Duplicate-Email-Username-Validation
Added functions to ion_auth library to support controller calls
b54a428
@jerel jerel Fixes #1597. prepend_metadata was using array_unshift on a non array …
…when called before append_metadata
2e5b8ae
@jerel jerel Merge branch '2.1/develop' of github.com:pyrocms/pyrocms into 2.1/dev…
…elop
3728f26
Commits on Jul 28, 2012
@adamfairholm adamfairholm Fixing the streams_unique and streams_slug_safe Validation functions.
These needed to be updated for namespaces and the move to the MY_Form_validation (and away from the custom Streams validation library).
5b4793d
Commits on Jul 29, 2012
@numerogeek numerogeek Update system/cms/modules/streams_core/models/row_m.php
Fix a Notice : 
A PHP Error was encountered
Severity: Notice




Message: Undefined variable: plugin_call




Filename: models/row_m.php




Line Number: 968
93d0c4d
@chrisfranson chrisfranson Fix keywords for pages e3b364d
@chrisfranson chrisfranson Fix keywords for blog posts 3713d73
Commits on Jul 30, 2012
@philsturgeon philsturgeon Merge pull request #1648 from bergeo-fr/patch-1
Update system/cms/modules/streams_core/models/row_m.php
a2b91c2
@philsturgeon philsturgeon Merge pull request #1649 from chrisfranson/2.1/develop
Keywords for Pages and Blog Posts
d88cdf2
@philsturgeon philsturgeon Fixed user username/email validity error message. 385bd08
@philsturgeon philsturgeon Merge branch '2.1/develop' of github.com:pyrocms/pyrocms into 2.1/dev…
…elop
68428c7
@philsturgeon philsturgeon Merge pull request #1434 from Renatov/patch-5
Update system/cms/themes/pyrocms/views/fragments/wysiwyg.php
f857ac8
@Chronial Chronial fixed redirect after login d6a8e8b
Commits on Jul 31, 2012
@philsturgeon philsturgeon Merge pull request #1655 from Chronial/feature/login_fix
fixed redirect after login
25f7bdf
@Chronial Chronial Fixed form validation in MY_Model::insert_many()
Cheers to Michael Wignail who actually found the bug and did this fix
ce528b0
Commits on Aug 01, 2012
@jerel jerel Fixes an issue that made it impossible to use EU regions in Amazon S3
If some of you are running the bleeding edge here you will need to make sure
migration 96 gets ran. Just set your migration config to 95, reload, set it to 96 and reload.
This is necessary because we don't want to add another migration to 2.1/develop
as it will cause more problems if we shift all 2.2/develop migrations
07adaca
@jerel jerel Fixed layout of the editor switcher on Pages 4029c07
@jerel jerel Fixes #1661. Removed query when reset pass was submitted with an empt…
…y form.

Also fixes another small issue with resets
2059051
@jerel jerel Added the allowed file type back to 2.1/develop as I believe it was r…
…emoved

accidentally as Streams uses it
c700caa
@jerel jerel Fixes #1524. Uploading two different file types via third-party code …
…would

result in one file being rejected as "file type not allowed" due to the allowed
types only being set when the library was first loaded
bd1d737
@jerel jerel Fixes #1646 and #1665. Keywords were not working with latin character…
…s. Thanks @stewones
f92f18f
Commits on Aug 02, 2012
@jamiefdhurst jamiefdhurst Rel attribute supported for theme:css 1fdaa77
Commits on Aug 03, 2012
@philsturgeon philsturgeon Merge pull request #1672 from jamiefdhurst/2.1/develop
Rel attribute supported for theme:css
f2a393f
@numerogeek numerogeek Update system/cms/modules/files/controllers/files_front.php
fixing displaying thumbs. In french it doesnt work without that fix
925bdf3
Commits on Aug 04, 2012
@ChristianGiupponi ChristianGiupponi Fixed Theme problem in Email Template Module
I have added some line of code to fix a graphical issue while user try
to clone an email template
f8c1032
@adamfairholm adamfairholm Adding 'insert_data' into stream_post_insert_entry event.
This was added for 2.2/develop and I'm adding it here for backwards compat.
9db6ac1
@adamfairholm adamfairholm Merge pull request #1576 from dadaxr/patch-3
Row_m::get_rows() do not use the second parameter. In addition the origi...
7b45bde
@adamfairholm adamfairholm Merge branch '2.1/develop' of github.com:pyrocms/pyrocms into 2.1/dev…
…elop
b57904a
@adamfairholm adamfairholm Removing the requirement for the website field in the comments module.
Addresses #1574.
73788f4
@adamfairholm adamfairholm Making a note that $fields in row_m->get_rows is not needed.
It should be phased out in PyroCMS 2.2.
2056df5
@adamfairholm adamfairholm Merge pull request #1683 from ChristianGiupponi/2.1/develop
Fixed Theme problem in Email Template Module
76c3a28
@adamfairholm adamfairholm Merge pull request #1676 from bergeo-fr/patch-2
Update system/cms/modules/files/controllers/files_front.php
5775226
Commits on Aug 06, 2012
@adamfairholm adamfairholm Fixing undefined variable error with comments.
Was referring to a variable that doesn't exist ($item).
8216e1a
@adamfairholm adamfairholm Fixing undefined variable error in image field type.
Note: This field type has been completely rewritten in 2.2
b9d1186
Commits on Aug 07, 2012
@numerogeek numerogeek Update system/cms/modules/streams_core/models/streams_m.php
Fix Notice when tryin to remove namespace
23ee796
@adamfairholm adamfairholm Fixing issue with Blog Archive widget.
There was an extra apostrophe plus the archive date format variable name was incorrect.
4c743aa
@adamfairholm adamfairholm Replacing wrong class name in Choices field type.
It had checkbox for radio buttons.
7ade6b1
@khalil-tabbal khalil-tabbal Fixing issue with Blog Archive widget. ee7e523
Commits on Aug 08, 2012
@adamfairholm adamfairholm Merge pull request #1699 from khalil-tabbal/2.1/develop
Fixing issue with Blog Archive widget.
e5bc807
@adamfairholm adamfairholm Fixing rogue ' in blog archive date format.
Except where it appeared to be intentional.
fbb00e6
@adamfairholm adamfairholm Merge pull request #1697 from bergeo-fr/patch-3
Update system/cms/modules/streams_core/models/streams_m.php
929d598
@adamfairholm adamfairholm Fixing another outdated variable in the comment helper. 9c12aa2
@jerel jerel Fixes #1685. Assets will now be cleared before the 404 page is shown.…
… Cleared up the terminology and docs around the show_404 method
fd9682a
@PyroCart PyroCart Update system/cms/helpers/MY_language_helper.php
Due the difficult to read code with language and sprintf (variables), we made a helper (sprintf_lang) where you can pass the line and the variables as an array. The helper processes it with sprintf. Clean code and easy to read!
68a32a6
@jerel jerel Merge pull request #1701 from PyroCart/patch-1
Update system/cms/helpers/MY_language_helper.php
7ab7404
@jerel jerel Merge pull request #1692 from Chronial/feature/installer
Add shared_addons as a package path in the installer
1e8e14c
@jerel jerel Merge pull request #1690 from Chronial/feature/my_model_fix
Fixed form validation in MY_Model::insert_many()
2a8af9b
Commits on Aug 09, 2012
@jerel jerel Fixes #1650. MySQL port was saved to the config file as 3306 regardle…
…ss of installer value.
daac8ec
@jerel jerel Merge branch '2.1/develop' of github.com:pyrocms/pyrocms into 2.1/dev…
…elop
f68ac31
Commits on Aug 10, 2012
@jerel jerel REST controller was extending only CI_Controller instead of MY_Contro…
…ller
5cf814a
@jerel jerel Bumped version number 4d7b314
@jerel jerel Merge branch 'release/v2.1.3' into 2.1/master 0c2647a
@jerel jerel Merge branch '2.1/master' of github.com:pyrocms/pyrocms into pagodabox d9074bb
@libregeek libregeek Fixed the PHP warning in Create categories popup.
Issue URL: #1703
970b1e6
Commits on Aug 12, 2012
@ChristianGiupponi ChristianGiupponi Feed source
Update link of feed rss to the new one
e225e79
Ryan Thompson Added comments CSS to CP 244b802
Ryan Thompson Tweaked d441294
Commits on Aug 13, 2012
Ryan Thompson I can has contribute spot ya? c9b2457
Commits on Aug 14, 2012
@adamfairholm adamfairholm Merge pull request #1717 from RyanThompson/patch-14
I can has contribute spot ya?
1657640
@adamfairholm adamfairholm Merge pull request #1704 from manilal/2.1/develop
Fixed the PHP warning in Create categories popup. Fixes #1703.
b3b261b
@adamfairholm adamfairholm Fixing fatal error when duplicating pages.
Fixes #1718.
fb06a70
@adamfairholm adamfairholm Merge pull request #1711 from ChristianGiupponi/2.1/develop
Feed rss source
148bcfe
@swilla swilla fixed non-object error on pages display plugin 13687b9
@philsturgeon philsturgeon Merge pull request #1720 from swilla/2.1/develop
fixed non-object error on pages display plugin
15e0844
Commits on Aug 15, 2012
@jerel jerel Fixes a typo in the Ion_Auth library that kept user activation emails…
… from sending
a9e5a74
@jerel jerel Merge branch '2.1/develop' of github.com:pyrocms/pyrocms into 2.1/dev…
…elop
22af287
@adamfairholm adamfairholm This is now 2.1.4-dev. 30a09fd
@swilla swilla Only shot link to module on backend if installed ab66395
@ChristianGiupponi ChristianGiupponi Changed version numer
Changed version number just to match constants.php file
d843cae
Commits on Aug 16, 2012
@adamfairholm adamfairholm Merge pull request #1724 from ChristianGiupponi/patch-1
Changed version numer
a458d35
@adamfairholm adamfairholm Merge pull request #1723 from swilla/2.1/develop
Only show link to module on backend if installed
9a0ca7a
@philsturgeon philsturgeon Added Scott to the Team
Not sure why he wasn't already on here.
bfb9709
Commits on Aug 17, 2012
@ChristianGiupponi ChristianGiupponi Typo
Fixed orrible typo in Italian language. Sorry for that!
b68d23e
@jerel jerel Merge pull request #1735 from ChristianGiupponi/patch-2
Fixed a typo in the italian translation
20b9108
@ChristianGiupponi ChristianGiupponi Some Italian updates
Translated some fields
d005cc7
@jerel jerel Fixes #1733. The file insert dialogue was looking for the "files" con…
…troller instead of "files_wysiwyg"
0da3eb5
@jerel jerel Merge branch '2.1/develop' of github.com:pyrocms/pyrocms into 2.1/dev…
…elop
37d245f
@jerel jerel Merge pull request #1736 from ChristianGiupponi/2.1/develop
Some Italian updates
34ac25b
@jerel jerel Fixed #1726. Pagination was missing from blog admin index page b171b2b
@jerel jerel Merge branch '2.1/develop' of github.com:pyrocms/pyrocms into 2.1/dev…
…elop
b9534ca
@ChristianGiupponi ChristianGiupponi Added italian language for the installation
Added gif and file to allow users to chose Italian as installation
language
918f7e7
@jerel jerel Fixes #1718. Duplicated pages were set to "home" and could end up at …
…the wrong level.
b451214
@jerel jerel Merge pull request #1737 from ChristianGiupponi/2.1/develop
Added italian language for the installation
b1a5acd
Commits on Aug 18, 2012
@jerel jerel Disabled persistent db connection in the installer as some hosts disa…
…llow that.
23e6782
Commits on Aug 19, 2012
@philsturgeon philsturgeon Updated reference to pyrocms.com to use HTTPS 84c04e9
Adam Fairholm Replacing mysql_escape_string with mysql_real_escape_string in instal…
…ler.

mysql_escape_string is deprecated and throws and error in E_STRICT:

http://php.net/manual/en/function.mysql-escape-string.php
a098c05
Adam Fairholm Creating some objects in the installer that were left out.
This was throwing installer errors in E_STRICT mode.
82c6047
Adam Fairholm Removing unnecessary database calls for the image, file, and relation…
…ship field types.

These three field types were making database calls based on an id when there was no ID. Fixes #1727.
f88e9af
Adam Fairholm Fixing naming conflict with streams_m runtime cache.
Fixes #1714 and #1725.
c93dc90
Commits on Aug 20, 2012
Adam Fairholm Some more E_STRICT stdClass() declarations. 0f01d20
@jerel jerel Corrected the admin form layout for additional page chunks 1944d25
@philsturgeon philsturgeon Fixed Lex bug where 0 would be output as an empty string. 05af574
@philsturgeon philsturgeon Merge branch '2.1/develop' of github.com:pyrocms/pyrocms into 2.1/dev…
…elop
96d98a5
Commits on Aug 21, 2012
@dhrrgn dhrrgn Fixing NULL variables not parsing correctly in Lex. dcd06ed
Commits on Aug 23, 2012
@sgoodwin10 sgoodwin10 Added events call when calling build_forms
When creating your own module using the streams_core, and you want to override the default CP view for forms, and create your own, the events for each field type where not getting called. With this, now all the JS and CSS is getting called, and the functionality works perfectly.
6714c40
Commits on Aug 25, 2012
@adamfairholm adamfairholm Merge pull request #1760 from btwong/2.1/develop
Added events call when calling build_forms with streams_core
15fc501
Commits on Aug 27, 2012
@broncha broncha PHP Version is always acceptable
Fixed a bug in installer (Any PHP version is acceptable). 
The installer would show a fail but yet allow to proceed to next step.
6c492ff
@philsturgeon philsturgeon Merge pull request #1777 from broncha/patch-1
PHP Version is always acceptable
2eb1b56
@ChristianGiupponi ChristianGiupponi Added asterisk to subject and body fields
The validation required Subject and Body but the view doesn't mark it as request with the asterisk.
This fix the "problem".
f2f1d30
@jerel jerel Merge pull request #1779 from ChristianGiupponi/patch-3
Added asterisk to required subject and body fields in email template
5b9ed84
@jerel jerel Redirect after login now works on the admin in addition to the front.…
… Fixes #1778

Example:
Navigate to: site.com/admin/blog/create while not logged in
You will be redirected to: site.com/admin
After signing in you will be at: site.com/admin/blog/create
f319cb5
Adam Fairholm Fixing Lex issue in tree_builder.
If $item['children'] is an empty array, it throws a Lex "array to string conversion error". If it's empty, we need to make it explicitly a null string.
a25aac3
Commits on Aug 28, 2012
@ChristianGiupponi ChristianGiupponi Some italian update
Some italian update
a0eeb5f
@philsturgeon philsturgeon Merge pull request #1780 from ChristianGiupponi/2.1/develop
Some italian update
d87ded4
Commits on Aug 29, 2012
@philsturgeon philsturgeon Fix issue #1752 for new installations. 2195a44
@philsturgeon philsturgeon Merge branch '2.1/develop' of github.com:pyrocms/pyrocms into 2.1/dev…
…elop
997f8c7
@rmwebs rmwebs Update system/cms/modules/pages/plugin.php
No idea why body was being set as an object - it should be an array as it was causing undefined errors on 2.1
077b702
@iKreativ iKreativ Issue 1785: IE font bug a2addca
@philsturgeon philsturgeon Merge pull request #1787 from rmwebs/patch-3
Update system/cms/modules/pages/plugin.php
715e7f4
@chadwithuhc chadwithuhc Updated user_helper Function Descriptions
Previously were missing or incorrect description
3b3c4d3
Commits on Aug 30, 2012
@jerel jerel Split category slugs on the pipe character in the blog:posts tag 4de5512
@jerel jerel Merge branch '2.1/develop' of github.com:pyrocms/pyrocms into 2.1/dev…
…elop
4506290
@jerel jerel Removed duplicate pagination view in the blog module 68f3102
@jerel jerel Fixed filtering in the blog module admin panel. Refactored views to fit 91cfafb
@khalil-tabbal khalil-tabbal 2.1/develop : french translation for global_lang 2284db8
@jerel jerel Merge pull request #1794 from khalil-tabbal/2.1/develop
2.1/develop : french translation for global_lang
138a4a5
@jerel jerel Merge pull request #1790 from chadwithuhc/fix/user-comments
Updated user_helper Function Descriptions
f8aed08
Commits on Aug 31, 2012
Adam Fairholm Fixing some PHP 5.4 E_STRICT issues. 952e546
@jerel jerel Got rid of the <ProgressEvent> has no method 'initProgressEvent' erro…
…r in the uploader
2b286e2
@jerel jerel Merge branch '2.1/develop' of github.com:pyrocms/pyrocms into 2.1/dev…
…elop
a4cc3a0
Adam Fairholm Little fix for insert_id not working on my local. 5ed17dc
Adam Fairholm Merge branch '2.1/develop' of github.com:pyrocms/pyrocms into 2.1/dev…
…elop
c24dac1
@ryun ryun Method _trackPageLoadTime is deprecated
Method _trackPageLoadTime is deprecated.
Site Speed tracking is enabled by default with trackPageview call at 1% sampling.
Use _setSiteSpeedSampleRate for changing sample rate.
bfbcd79
@jerel jerel Bumped version numbers 590da6b
@jerel jerel Merge branch 'release/v2.1.4' of github.com:pyrocms/pyrocms into 2.1/…
…master
b256a11
Commits on Sep 01, 2012
@philsturgeon philsturgeon Merge pull request #1796 from ryun/patch-9
Method _trackPageLoadTime is deprecated
24c738d
Commits on Sep 02, 2012
@ChristianGiupponi ChristianGiupponi Some italian update for the language file
I have fixed some typos and most important thing I have changed
"Cancella" with "Annulla" on the "Cancel" label.
In iItaly is common error translate "Cancel" with "Cancella" instead of
"Annulla"
620e34f
@ChristianGiupponi ChristianGiupponi Added Help lang file
Added Help lang file for the Italian translation
c312fd9
Commits on Sep 03, 2012
Adam Fairholm Adding Lex tag parsing of chunk content from the plugin function.
This can be overridden by a new parse_tags="yes/no" parameter. Previously, chunks that were accessed via the plugin function were not parsed for their Lex tags.

Fixes #1799.
b93fba4
@khalil-tabbal khalil-tabbal 2.1/develop : french translations b3665cb
@khalil-tabbal khalil-tabbal Revert "2.1/develop : french translations"
This reverts commit b3665cb.
3de07ba
@khalil-tabbal khalil-tabbal 2.1/develop : french translations 4dee493
Commits on Sep 04, 2012
@jerel jerel Merge branch '2.1/develop' of github.com:pyrocms/pyrocms into 2.1/master 930e624
@jerel jerel Merge branch '2.1/master' of github.com:pyrocms/pyrocms into pagodabox e6fc78b
@jerel jerel Added the database connection to mysql_real_escape_string() to get ri…
…d of warning in the installer
5e93ac6
@jerel jerel Added the database connection to mysql_real_escape_string() to get ri…
…d of warning in the installer
93f2cd4
@ChristianGiupponi ChristianGiupponi Merge git://github.com/pyrocms/pyrocms into 2.1/develop f31c748
@khalil-tabbal khalil-tabbal Merge branch '2.1/develop' of git://github.com/pyrocms/pyrocms into 2…
….1/develop
30ab929
Commits on Sep 06, 2012
@adamfairholm adamfairholm Merge pull request #1800 from ChristianGiupponi/2.1/develop
Some italian update for the language file
fb4ea36
@adamfairholm adamfairholm Merge pull request #1808 from khalil-tabbal/2.1/develop
2.1/develop : french translations
67a2d06
@numerogeek numerogeek Multiform support
see here for detail : https://www.pyrocms.com/forums/topics/view/19742

ADAM : 
in the plugin of PyroStream, right here : 
system/cms/modules/streams/plugin.php

In the function form(), just after 
	if ($mode == 'edit') $hidden = array('row_edit_id' => $row->id);




you should add the line 
$hidden['stream_id'] 	=  $data->stream_id;
564604b
Commits on Sep 07, 2012
@jerel jerel Due to a merge conflict a last minute fix didn't work properly. This …
…is a hotfix for that and document uploads. Fixes #1811. Fixes #1821
12890e2
@jerel jerel Merge branch '2.1/master' of github.com:pyrocms/pyrocms into 2.1/develop 116c2fe
@jerel jerel Merge branch '2.1/develop' of github.com:pyrocms/pyrocms into 2.1/dev…
…elop
a5b2689
Commits on Sep 10, 2012
@adamfairholm adamfairholm Adding a disallow dashes parameter for generate_slug
There are many Pyro applications where you do not want to have dashes since Lex does not play nicely with them. This will filter them out.
211ebc6
@adamfairholm adamfairholm Adding no dashes to the create fields Streams JS.
Addresses #1813.
29b7690
@adamfairholm adamfairholm Adding in slug instructions.
IE: lowercase with no characters except underscores. This can be used throughout PyroCMS as Lex dictates a pretty uniform syntax for variables. Addresses #1813.
900d064
@adamfairholm adamfairholm Splitting up the slug safe form validation functions.
Now comes in two flavors: Lex and MySQL slug safe.

Addresses #1813.
a914953
@adamfairholm adamfairholm Using Lex/Mysql slug safe for new fields. 0cc6b68
@ChristianGiupponi ChristianGiupponi update cms lang
update cms lang
a1c9c83
@jerel jerel Merge pull request #1834 from ChristianGiupponi/2.1/develop
update cms lang
9de6760
Commits on Sep 11, 2012
@adamfairholm adamfairholm Fixing pagination for the CP Field Assignments function.
This was previously sending the offset where the offset URI segment should go. This changes to the page number in 2.2/develop.
6d22022
Commits on Sep 12, 2012
@adamfairholm adamfairholm Restoring missing blog table column headers.
Fixes #1839.
6e4b061
@adamfairholm adamfairholm Fixing wrong function names in asset plugin.
Implementing select fixes in Issue #1838 from 2.2/develop.
9ffe1a1
@adamfairholm adamfairholm Updating the Twitter username regex.
This was catching things like email addresses. This fixes thing. Modification to the one proposed in Issue #1789.
5660160
@adamfairholm adamfairholm Walking back splitting streams_slug_safe.
Realized this is probably not the most prudent thing to do in a bug fix branch. Will add this into 2.2, but this still retains the added bonus of validating the slug for use as a Lex variable.
ddf6d43
@adamfairholm adamfairholm Fixing missing status label on Blog posts. 28b7e25
@khalil-tabbal khalil-tabbal 2.1/develop : french translations for streams 97c5eb3
@khalil-tabbal khalil-tabbal 2.1/develop : french translations 04d9adc
@khalil-tabbal khalil-tabbal 2.1/develop : french translations b0c1f71
@adamfairholm adamfairholm Merge pull request #1844 from khalil-tabbal/2.1/develop
2.1/develop : french translations
9ccbdb5
Commits on Sep 13, 2012
@adamfairholm adamfairholm Fixing more language variable issue in the the blog module. cab7f29
@adamfairholm adamfairholm Merge branch '2.1/develop' of github.com:pyrocms/pyrocms into 2.1/dev…
…elop
e139d86
@adamfairholm adamfairholm Updating more blog variables. 00cad2c
@jerel jerel Fixes a typo in the comments helper fd03a2b
Commits on Sep 16, 2012
@minerbog minerbog Update system/cms/modules/comments/models/comments_m.php
Suggestion to allow users to get only active comments. I use this mod in one of my plugins just to get the latest active comment.
a9ef8cb
@philsturgeon philsturgeon Merge pull request #1855 from minerbog/patch-1
Update system/cms/modules/comments/models/comments_m.php
11e50a7
@philsturgeon philsturgeon Merge pull request #1713 from RyanThompson/patch-11
Added comments CSS to CP
eeeb001
Commits on Sep 17, 2012
@philsturgeon philsturgeon Stop the user plugin accessing password or salt data. 182f6a1
@philsturgeon philsturgeon Merge branch '2.1/develop' of github.com:pyrocms/pyrocms into 2.1/dev…
…elop
897e2be
@dadaxr dadaxr fix "update_stream" feature. 0f030ba
Commits on Sep 18, 2012
@adamfairholm adamfairholm Update to user_displayname that fixes unintended caching of first pre…
…ferences.

Closes #1863. Code from @andrew13.
5d19310
@adamfairholm adamfairholm Merge pull request #1818 from bergeo-fr/2.1/develop
Multiform support
4757e83
@adamfairholm adamfairholm Cleaning up the syntax of the last merged pull request a little bit. 0488515
@adamfairholm adamfairholm Allowing multiple stream edit forms by matching row_ids.
Addresses #1870.
302f065
@adamfairholm adamfairholm Merge pull request #1867 from dadaxr/2.1/develop
fix "update_stream" feature.
9a410bc
@AkibaTech AkibaTech Added missing French translation in widgets
- Google maps
- HTML
- Login
- Navigation
- RSS Feed
- Social Bookmark
e70817c
@jerel jerel Merge pull request #1871 from AkibaTech/2.1/develop
Added missing French translation in widgets
8a7ff0a
Commits on Sep 21, 2012
@minerbog minerbog Add category field to rss feed for use with Feedburner 06568c8
@philsturgeon philsturgeon Merge pull request #1889 from minerbog/2.1/develop
Add category field to rss feed for use with Feedburner
6ae20a2
@adamfairholm adamfairholm Adding new form key functionality.
With a hidden _streams_form_key entry, we can have multiple forms on the same page. You can set the form_key via the streams plugin in the future.
6256bd4
@adamfairholm adamfairholm Merge branch '2.1/develop' of github.com:pyrocms/pyrocms into 2.1/dev…
…elop
6257290
Commits on Sep 24, 2012
@faizalmy faizalmy Change $page variable output as object.
$page result returns as objects, not arrays.
8ee57eb
@philsturgeon philsturgeon Merge pull request #1895 from jcrys/master
Pages preview variable output should be object
4fddcf7
@adamfairholm adamfairholm Fixing E_STRICT errors on blog RSS. b6b8c45
@adamfairholm adamfairholm Fixing run_type_events.
It was losing information about what field types had been called and duplicating field type events calls.
6bb9b5e
@adamfairholm adamfairholm Merge branch '2.1/develop' of github.com:pyrocms/pyrocms into 2.1/dev…
…elop
df4eff2
@adamfairholm adamfairholm Fixing file_id variable in files plugin.
I was mistakenly taking file_id from the folders table, not files.
2c60f31
Commits on Sep 25, 2012
@dhrrgn dhrrgn Applied changes from Lex 2.1. 1dd71cf
Commits on Sep 26, 2012
@liam1412 liam1412 Update .htaccess
Apache MultiView directive is enabled on some shared hosting providers. It doesn't play
nicely with URL rewriting
3910f9b
Commits on Sep 27, 2012
@wturrell wturrell Typo in reference to Codeigniter character_limiter helper 0027982
@jerel jerel Merge pull request #1913 from wturrell/bugfix_character_limiter_helper
Typo in reference to Codeigniter character_limiter helper
663e00d
@wturrell wturrell Bugfix: md5hash instead of keywords displayed in admin/pages ajax res…
…ponse
1e6d374
@jerel jerel Merge pull request #1914 from wturrell/bugfix_meta_keywords
Bugfix: md5hash instead of keywords displayed in admin/pages ajax respon...
885d627
Commits on Sep 28, 2012
@numerogeek numerogeek Language support problem 58d2fbc
Commits on Sep 29, 2012
@adamfairholm adamfairholm Fixing issue with single choice checkbox.
Previously, pre_save was not being run when there was no data for it. Fixes #1917.
97cdc82
@adamfairholm adamfairholm Merge pull request #1916 from bergeo-fr/patch-1
Language support problem when using view_options
f6c5a37
@adamfairholm adamfairholm Merge pull request #1907 from liam1412/patch-1
Update .htaccess
8abb56e
Commits on Oct 01, 2012
@adamfairholm adamfairholm Fixing an issue with fields from different namespaces getting confused.
The all_fields class had not been converted to be namespace specific, so the formatting data might get mixed up with fields of the same slug (just the formatting data, not the actual data).
7fdaa71
Commits on Oct 02, 2012
@philsturgeon philsturgeon Fixed a PHP 5.4 error for page layouts. 5aee7cc
@ryun ryun Updated Markdown_Parser to v1.0.1o
Updated Markdown_Parser to newest version. (1.0.1n 2009 to v1.0.1o 2012)
This should fix a few things (like POSIX errors)
86f4bdf
Commits on Oct 09, 2012
@philsturgeon philsturgeon Fixed a PHP 5.4 error if no theme layouts existed. 18a2874
@philsturgeon philsturgeon Merge branch '2.1/develop' of github.com:pyrocms/pyrocms into 2.1/dev…
…elop
e4002e3
@philsturgeon philsturgeon Merge pull request #1920 from ryun/patch-12
Updated Markdown_Parser to v1.0.1o 2012
e91cc38
Commits on Oct 12, 2012
@adamfairholm adamfairholm Adding Save/Save & Exit to page layouts. 932c705
@adamfairholm adamfairholm Merge branch '2.1/develop' of github.com:pyrocms/pyrocms into 2.1/dev…
…elop
62d0774
@adamfairholm adamfairholm Error prevention in date time field type if the type param is not set. 331faf6
@adamfairholm adamfairholm Updating field/image field types to work with cloud files.
This was updated on 2.2, but they really should be on the 2.1.x branch.

Fixes #1919.
16bf5fe
Commits on Oct 13, 2012
@adamfairholm adamfairholm Fixing page layout form label.
Fixes #1940.
b791671
@dhrrgn dhrrgn Fixes issue #1906: Moved variable re-processing and added a secondary…
… string extraction incase the callback returned a string.
8f1c38c
David Lewis Fixes #1954: Auto PYRO_ENV detection in .htaccess 707087a
Commits on Oct 14, 2012
David Lewis Re-add the SetEnv line 16b58a7
@jerel jerel Fixes #1187. Stale sessions were not cleaned from the database which …
…resulted in large numbers of session records over time.

This adds a simple method of cron jobs that will work on shared hosting and other
restricted servers. In a future version we need to add a public controller
that a regular cron job (or something like Pingdom) can curl for precise cron tasks
1b140c7
@jerel jerel Fixed an issue with buttons staying bound to the click event in the f…
…ile description modal
c492b16
Commits on Oct 15, 2012
@adamfairholm adamfairholm Merge pull request #1955 from HighwayofLife/issues/1954
Fixes #1954: Auto PYRO_ENV detection in .htaccess
15d2e10
@adamfairholm adamfairholm Adding in redirect override from 2.2 so we can get it into 2.1.5. 6a677a3
Commits on Oct 16, 2012
@jerel jerel The analytics graph is now re-drawn when the browser is resized e62a69e
@jerel jerel Merge branch '2.1/develop' of github.com:pyrocms/pyrocms into 2.1/dev…
…elop
b6f9c87
@jerel jerel Modified pages custom css so that is always gets appended last to mak…
…e sure it overrides theme css
d95b837
@adamfairholm adamfairholm Adding support for alt_process for users module.
Previously was trying to select alt process data.
af1946b
Commits on Oct 20, 2012
@silentworks silentworks Replaced red highlight with a blue one
Red is normally taken as an error message as this was what I thought it
was when I entered value into the fields.
b4c4ebc
@adamfairholm adamfairholm Merge pull request #1966 from silentworks/2.1/develop
Replaced red highlight with a blue one
84e59de
@adamfairholm adamfairholm Adding default value option to Country field type.
Addresses #1815.
194301b
@adamfairholm adamfairholm Adding default value to US State field type.
Addresses #1815.
046a71c
@adamfairholm adamfairholm Fixing country field type default value.
We should only see it on editing an entry.
998f3f6
@adamfairholm adamfairholm Adding default value option to year field type.
Addresses #1815.
6696518
@adamfairholm adamfairholm Making default value for text area field type be a text area box.
Addresses #1815
bd87128
Commits on Oct 22, 2012
@brettahale brettahale Update system/cms/modules/blog/plugin.php
Added offset to blog posts method and a $post->count for help with looping in the plugin.
bb5dae2
Commits on Oct 23, 2012
@adamfairholm adamfairholm Removing permission group checkbox behavior.
Previously, you couldn't just select access to a module, you had to select at least one permission within that module. This is a really restrictive way of seeing permissions - we need the ability to have a module be accessed with a base level of permissions.
108c581
@philsturgeon philsturgeon Merge pull request #1972 from brhale21/patch-1
Update system/cms/modules/blog/plugin.php
82f0394
@adamfairholm adamfairholm Fixing E_STRICT error in Streams CP. 5b9dbe4
@adamfairholm adamfairholm Adding is_logged_in() function.
I think this is a pretty fundamental function to have hanging around, and should be in the 2.1/develop branch.
acad1d9
@adamfairholm adamfairholm Additional features to Streams CP:
- A 'columns' parameter to override view options.
- Entry sorting (option + override)
05a434b
@adamfairholm adamfairholm Fixing issue with AJAX sorting in streams.
Previously, streams sorting ajax functions were housed under the Admin_Controller controller, so that only admins could sort entries and fields.

I've solved this for the 2.1 branch by checking to see if the current user has permission to access the module (at a base level) before allowing a sort. This is as far as we can go in 2.1, and we'll have more robust controls in 2.2.

Note: this will require a streams module upgrade.

This fixes #1513 and #1565.
9c33fdc
@adamfairholm adamfairholm Merge branch '2.1/develop' of github.com:pyrocms/pyrocms into 2.1/dev…
…elop
0961755
Commits on Oct 25, 2012
@brettahale brettahale Update system/cms/modules/settings/details.php
Incorrectly escaped " in urls. This probably needs an update added but I am not sure how to do that.
89e49d6
Commits on Oct 30, 2012
@adamfairholm adamfairholm Merge pull request #1978 from brhale21/patch-2
Update system/cms/modules/settings/details.php
bdf6e3e
Commits on Oct 31, 2012
@jerel jerel Bumped version numbers 7b24716
@adamfairholm adamfairholm Very minor formatting. 66c3bc0
@adamfairholm adamfairholm Adding multiple relationship support into streams_core if anyone need…
…s it before the new streams nested tag syntax in 2.2.
ea0b78f
@adamfairholm adamfairholm Fixing a bug where the wrong ID could theoretically be passed as the …
…entry ID to profile inputs.
186762d
@adamfairholm adamfairholm Fixing integration issues with alt process field types in the user pl…
…ugin.
1c9f9e3
@jerel jerel Merge branch '2.1/develop' of github.com:pyrocms/pyrocms into release…
…/2.1.5
7b61788
Commits on Nov 02, 2012
@jerel jerel Updated release date 43a44de
Commits on Feb 06, 2013
@jerel jerel Merge tag 'v2.1.5' into pagodabox 9a4d73e