Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
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: hansek/revolution
base: 36954e1389
...
head fork: hansek/revolution
compare: 064795c772
Commits on Jan 26, 2012
@enigmatic-user enigmatic-user Translated the new phrases to German.
Signed-off-by: Jan-Christoph Ihrens <ihrens@cc-services.de>
5fe1643
Commits on Feb 08, 2012
@enigmatic-user enigmatic-user Merge remote-tracking branch 'upstream/release-2.2' into release-2.2 3f6f036
@enigmatic-user enigmatic-user Translated new phrase in permissions.inc.php to German
Signed-off-by: Jan-Christoph Ihrens <ihrens@cc-services.de>
cfc4483
Commits on Feb 29, 2012
Shaun McCormick [#3818] Add UI/processing to set response code for weblinks 000e559
@netProphET netProphET add dashboard name to dashb heading on non-default dashb 3f18515
Commits on Mar 05, 2012
Shaun McCormick [#7279] Handle edge case where processor classes might already be loa…
…ded with CRCs causing issues with runProcessor
6da5ec7
Shaun McCormick [#7306] Sanity check for reload data for resource groups when changin…
…g template of new resource
a0500cb
Commits on Mar 07, 2012
@netProphET netProphET [#7326] fix inability to unset a TV's Input Option Values field
Logic around setting the 'elements' field was too loose.
3b330d9
Commits on Mar 08, 2012
Shaun McCormick Fixed ellipsis filter to not cut off html tags in property 310ca8e
Shaun McCormick Fix persistence issue with clear cache checkbox on resources without …
…change state
ae9483c
Shaun McCormick [#7315] Standardize default sorting for User Group access grids 86b0be0
Shaun McCormick [#3860] Fix session issue with modUser joinGroup/leaveGroup methods 8a543b0
Shaun McCormick [#7052] Prevent username/host/dbname from being set as a system setti…
…ng placeholder
399c972
@enigmatic-user enigmatic-user Merge remote-tracking branch 'upstream/release-2.2' into release-2.2 0e1bd38
@enigmatic-user enigmatic-user Translated newest phrases to German, improved the translation of some…
… of the existing phrases

Signed-off-by: Jan-Christoph Ihrens <ihrens@cc-services.de>
b2ef5da
Commits on Mar 14, 2012
Shaun McCormick Prevent fatal error if invalid class_key is passed to Resource edit/c…
…reate page
1f170ce
Commits on Mar 15, 2012
@opengeek opengeek Update to xPDO 2.2.3-pl
* master:
  xPDO 2.2.3-pl
  Bump version for 2.2.3-pl release
  xPDOScriptVehicle added for manifest-based scripts
  Implement xPDOQuery::having() method
  Add xPDO::getInstance() for singleton support
  Documentation updates

Conflicts:
	core/xpdo/changelog.txt
35adcc6
@opengeek opengeek Merge branch 'release-2.2' into develop
* release-2.2:
  Update to xPDO 2.2.3-pl
  Prevent fatal error if invalid class_key is passed to Resource edit/create page
  [#7052] Prevent username/host/dbname from being set as a system setting placeholder
  [#3860] Fix session issue with modUser joinGroup/leaveGroup methods
  [#7315] Standardize default sorting for User Group access grids
  Fix persistence issue with clear cache checkbox on resources without change state
  Fixed ellipsis filter to not cut off html tags in property
  [#7326] fix inability to unset a TV's Input Option Values field
  [#7306] Sanity check for reload data for resource groups when changing template of new resource
  [#7279] Handle edge case where processor classes might already be loaded with CRCs causing issues with runProcessor
  add dashboard name to dashb heading on non-default dashb
  [#3818] Add UI/processing to set response code for weblinks
ae864ad
Commits on Mar 16, 2012
Shaun McCormick [#7362] Fix issue with conflicting FC Sets when User belongs to more …
…than one User Group with a Set
6abef1d
Shaun McCormick [#7322] Fix issue where certain regions were not able to be hid via F…
…C; clarified FC set labels
919f05c
Shaun McCormick [#7357] Prevent viewing of Profile if user does not have change_profi…
…le permission
5ddf860
@opengeek opengeek Add missing index to modSession.access 5e526a3
@enigmatic-user enigmatic-user Translated new phrases to German
Signed-off-by: Jan-Christoph Ihrens <ihrens@cc-services.de>
cb5c4d5
@enigmatic-user enigmatic-user Corrected a word in the German translation (in setting.inc.php)
Signed-off-by: Jan-Christoph Ihrens <ihrens@cc-services.de>
3ec8a89
@enigmatic-user enigmatic-user Improved (shortened) a phrase in access.inc.php
Signed-off-by: Jan-Christoph Ihrens <ihrens@cc-services.de>
f9fd513
@enigmatic-user enigmatic-user Translated newest phrases to German (resource.inc.php)
Signed-off-by: Jan-Christoph Ihrens <ihrens@cc-services.de>
c6b9d3c
Shaun McCormick [#7363] Check for this.stateful in MODx.tree.Tree::_saveState bb0e01a
Shaun McCormick [#7364] Add setting to set default sort field of MODx.Browser view 0a6deef
Shaun McCormick [#7333] Prevent error when id is undefined in resource edit controller 52b12b7
Commits on Mar 19, 2012
Shaun McCormick [#7357] Add else check to profile link in header to at least display …
…name
1f4a0ca
Shaun McCormick [#7364] Better checking for default sort on file browser 2a836ab
Shaun McCormick [#7389] Prevent error when input is shorter than truncate length in e…
…llipsis filter
88852ef
Shaun McCormick Add MODX favicon.ico to site root for default in sites d5608c2
@Mark-H Mark-H Fix change profile link ac13aa2
Commits on Mar 20, 2012
Shaun McCormick [#7011] Prevent infinite recursion error in modElement::isStaticSourc…
…eMutable
4583c73
Shaun McCormick [#6864] Fix rare issue where primary group is not set for user, and c…
…ustom dashboard for their group does not propagate
d44de7a
@Mark-H Mark-H Merge branch 'release-2.2' of https://github.com/modxcms/revolution i…
…nto release-2.2
33a7364
@Mark-H Mark-H [#6687] Fix duplicated OK buttons in MODx.Console in certain situations 047cc61
@Mark-H Mark-H [#6501] Fix SuperBoxSelect selections spanning multiple rows e4536b7
@Mark-H Mark-H [#6496] Fix quick edit modal windows for elements on smaller screens. b5c43cd
Shaun McCormick Merge remote-tracking branch 'Mark-H/bug-6496' into release-2.2
* Mark-H/bug-6496:
  [#6496] Fix quick edit modal windows for elements on smaller screens.
5ed7247
Shaun McCormick Merge remote-tracking branch 'Mark-H/bug-6501' into release-2.2
* Mark-H/bug-6501:
  [#6501] Fix SuperBoxSelect selections spanning multiple rows

Conflicts:
	core/docs/changelog.txt
24c042e
Shaun McCormick Merge remote-tracking branch 'Mark-H/bug-6687' into release-2.2
* Mark-H/bug-6687:
  [#6687] Fix duplicated OK buttons in MODx.Console in certain situations
  Fix change profile link

Conflicts:
	core/docs/changelog.txt
cb66b94
Shaun McCormick Merge remote-tracking branch 'enigmatic-user/release-2.2' into releas…
…e-2.2
f07f153
@Mark-H Mark-H [#6934] Fix for only showing the resource delete button if all permis…
…sions are given
1688f67
@enigmatic-user enigmatic-user Translated newest phrases to German, improved the translation of some…
… of the existing phrases

Signed-off-by: Jan-Christoph Ihrens <ihrens@cc-services.de>
64bb0ef
Shaun McCormick [#7362] Fix issue with conflicting FC Sets when User belongs to more …
…than one User Group with a Set
203b6e9
Shaun McCormick [#7322] Fix issue where certain regions were not able to be hid via F…
…C; clarified FC set labels
17eab69
Shaun McCormick [#7357] Prevent viewing of Profile if user does not have change_profi…
…le permission
537b63e
@opengeek opengeek Add missing index to modSession.access dea3991
Shaun McCormick [#7363] Check for this.stateful in MODx.tree.Tree::_saveState ae307d7
Shaun McCormick [#7364] Add setting to set default sort field of MODx.Browser view 52fcf53
Shaun McCormick [#7333] Prevent error when id is undefined in resource edit controller d348ff8
Shaun McCormick [#7357] Add else check to profile link in header to at least display …
…name
9484216
Shaun McCormick [#7364] Better checking for default sort on file browser e90b83a
Shaun McCormick [#7389] Prevent error when input is shorter than truncate length in e…
…llipsis filter
5fa072c
Shaun McCormick Add MODX favicon.ico to site root for default in sites b967fc7
@Mark-H Mark-H Fix change profile link 670249c
Shaun McCormick [#7011] Prevent infinite recursion error in modElement::isStaticSourc…
…eMutable
d454af1
Shaun McCormick [#6864] Fix rare issue where primary group is not set for user, and c…
…ustom dashboard for their group does not propagate
f0efbab
@Mark-H Mark-H [#6687] Fix duplicated OK buttons in MODx.Console in certain situations 1021202
@Mark-H Mark-H [#6501] Fix SuperBoxSelect selections spanning multiple rows 23a3e49
@Mark-H Mark-H [#6496] Fix quick edit modal windows for elements on smaller screens. d67fa36
Commits on Mar 21, 2012
Shaun McCormick Merge remote-tracking branch 'Mark-H/bug-6934' into release-2.2
* Mark-H/bug-6934:
  [#6934] Fix for only showing the resource delete button if all permissions are given
9bbb82d
Shaun McCormick Prevent php notice when set constraint doesnt have any related TVs 1f4ba63
Commits on Mar 22, 2012
@enigmatic-user enigmatic-user Translated the newest phrases to German (formcustomization.inc.php, s…
…etting.inc.php)

Signed-off-by: Jan-Christoph Ihrens <ihrens@cc-services.de>
5c7e899
@enigmatic-user enigmatic-user Translated the newest phrases to German (formcustomization.inc.php, s…
…etting.inc.php)

Signed-off-by: Jan-Christoph Ihrens <ihrens@cc-services.de>
dc17bae
Commits on Mar 23, 2012
Shaun McCormick Merge remote-tracking branch 'enigmatic-user/german_translation' into…
… release-2.2

* enigmatic-user/german_translation:
  Translated the newest phrases to German (formcustomization.inc.php, setting.inc.php)
  [#6496] Fix quick edit modal windows for elements on smaller screens.
  [#6501] Fix SuperBoxSelect selections spanning multiple rows
  [#6687] Fix duplicated OK buttons in MODx.Console in certain situations
  [#6864] Fix rare issue where primary group is not set for user, and custom dashboard for their group does not propagate
  [#7011] Prevent infinite recursion error in modElement::isStaticSourceMutable
  Fix change profile link
  Add MODX favicon.ico to site root for default in sites
  [#7389] Prevent error when input is shorter than truncate length in ellipsis filter
  [#7364] Better checking for default sort on file browser
  [#7357] Add else check to profile link in header to at least display name
  [#7333] Prevent error when id is undefined in resource edit controller
  [#7364] Add setting to set default sort field of MODx.Browser view
  [#7363] Check for this.stateful in MODx.tree.Tree::_saveState
  Add missing index to modSession.access
  [#7357] Prevent viewing of Profile if user does not have change_profile permission
  [#7322] Fix issue where certain regions were not able to be hid via FC; clarified FC set labels
  [#7362] Fix issue with conflicting FC Sets when User belongs to more than one User Group with a Set
  Translated newest phrases to German, improved the translation of some of the existing phrases
6e55ecf
Shaun McCormick [#6931] Workaround for template changing issue on servers that have m…
…isconfigured date_timzeone setting
06ab4f4
Shaun McCormick [#7456] Fix for minify not modified status in fastcgi environments d13b494
Shaun McCormick [#7455] Fallback to TV name if caption not found when displaying TV i…
…nputs
117473c
Commits on Mar 25, 2012
@enigmatic-user enigmatic-user Merge remote-tracking branch 'upstream/release-2.2' into release-2.2 644acf4
Commits on Mar 26, 2012
Shaun McCormick Merge remote-tracking branch 'enigmatic-user/release-2.2' into releas…
…e-2.2

* enigmatic-user/release-2.2:
  Translated the newest phrases to German (formcustomization.inc.php, setting.inc.php)
117688c
Shaun McCormick Fix regression issue with PM tree and _saveState 4448c29
Shaun McCormick [#7446] Added extra checks to protect against parse errors with :then…
… and :else output filters
b8a4585
Shaun McCormick [#7445] Fix issues with TVs not respecting Resource Groups limiting a…
…ccess
e7bd6f2
Shaun McCormick Fix array/string notice when sending forgot password in login controller 2f62a78
Shaun McCormick Add "sudo" user attribute, which bypasses access permissions for said…
… user; upgrade to 2.2.1 makes Super Users in Administrator group sudo users
53a0086
Shaun McCormick Ensure initial first user is sudo d9ff39e
Commits on Mar 27, 2012
Shaun McCormick [#7481] Fix issue with reloading resource when changing templates and…
… the context alias cache
9a86fa6
Shaun McCormick [#7391] Fix UI error causing resource group checkboxes on TV edit pag…
…e to not render correctly
ac24fc0
Shaun McCormick [#6894] Move Import button on Access Policy and Access Policy Templat…
…e grids to top toolbar
55e9998
@opengeek opengeek Add relation criteria/related object vehicle fixes
- Add criteria support to aggregate/composite relations
- Fix xPDOObjectVehicle->_installRelated()

Squashed commit of the following:

commit 168b84eed05f75a73af9fe3319434cd7171e6650
Author: Jason Coward <jason@modx.com>
Date:   Tue Mar 27 12:35:52 2012 -0600

    Update xPDO

    - Fix related_object installation in xPDOObjectVehicle

commit 053b0f0c611ef18ca37802149b749ccc5f99da40
Author: Jason Coward <jason@modx.com>
Date:   Tue Mar 27 10:50:02 2012 -0600

    orm-fix wip

commit c6b80196fb7ffe907f4d46a58dc163068b40680e
Author: Jason Coward <jason@modx.com>
Date:   Thu Mar 22 08:10:23 2012 -0600

    Add missing and fix non-functional model relations

commit 9897a498d69c5b69858aaaf0056e2f2d6b69d501
Author: Jason Coward <jason@modx.com>
Date:   Wed Mar 21 15:32:41 2012 -0600

    [xPDO] Add criteria support to aggregates and composites

    Conflicts:
    	core/xpdo/changelog.txt
c847ac3
@opengeek opengeek Merge branch 'release-2.2' into develop
* release-2.2:
  Add relation criteria/related object vehicle fixes
  [#6894] Move Import button on Access Policy and Access Policy Template grids to top toolbar
  [#7391] Fix UI error causing resource group checkboxes on TV edit page to not render correctly
  [#7481] Fix issue with reloading resource when changing templates and the context alias cache
064795c