Commit Graph

9842 Commits

Author SHA1 Message Date
TeamCity
e4ab0e5a3d MINOR Updated translations 2012-08-31 22:19:06 +12:00
Sam Minnée
1629a856de Merge pull request #759 from patbolo/bugfix/7832
FIX 7832 Lang files for ss macron plugin - correct path to "langs", not "lang"
2012-08-30 17:24:07 -07:00
jean
85ab39b280 FIX 7832 Lang files for ss macron plugin - correct path to "langs", not "lang"
MINOR Use consistent ed.getLang method
2012-08-31 11:57:44 +12:00
Saophalkun Ponlu
f3fcae315d BUG Fix wrong date conversion from PHP format 'y' to jquery date and back.
While 'y' in PHP means 4 digits year (e.g. 2012), jquery date picker means 2 digits (e.g. 12). That's all fine until then but when you pass the 2 digit year value back to PHP it all goes awry.
For exmple, defatult date format in en_US is 'MMM d, y' so in jquery date picker it's something like this 'Aug 22, 12' and eventually PHP will convert that value to '0012-08-22' which completely wrong.
2012-08-30 22:21:04 +02:00
Simon Welsh
14b8071803 Merge pull request #757 from wilr/trac/7504
FIX: ensure date input has a date picker to trigger open (#7504).
2012-08-30 03:42:12 -07:00
Will Rossiter
10d0296721 FIX: ensure date input has a date picker to trigger open (#7504) 2012-08-30 22:39:06 +12:00
Simon Welsh
daf347f08c Merge pull request #755 from wilr/doc/template-top
Add reference for TOP in template documentation
2012-08-29 23:53:41 -07:00
Will Rossiter
678232f533 Add reference for template documentation 2012-08-30 18:43:19 +12:00
Sam Minnée
57ad36e11d Merge pull request #750 from silverstripe-rebelalliance/open/5971
FIX If ClassName read from DB doesnt exist, dont break
2012-08-29 22:48:31 -07:00
Sam Minnée
898f9ad3a9 DOC Gave easier instructions for would-be authors
The use of GitHub for documentation isn't ideal in a world full of wikis,
but we do it because it has other substantial advantages. However, we
shouldn't assume that every would-be author is comfortable using pull requests.

This change presents the edit-on-github interaction as the most straightforward
one, suggesting that advanced users may which to check out locally.
2012-08-30 12:54:52 +12:00
Hamish Friedlander
2f00884e79 FIX If ClassName read from DB doesnt exist, dont break
We know the subclass of a record by its ClassName value, but code changes
might have meant that class no longer exists. We used to just break,
but this patch overrides the apparent value of ClassName to be
one that exists in that situation
2012-08-30 11:02:50 +12:00
Sean Harvey
619ea7c7dc Merge pull request #752 from silverstripe-big-o/session-namespace
LeftAndMain::$session_namespace (#7815)
2012-08-29 14:25:38 -07:00
TeamCity
da95c74dba MINOR Updated translations 2012-08-30 08:18:20 +12:00
TeamCity
2b0569fad2 MINOR Updated translations 2012-08-30 06:18:03 +12:00
Ingo Schommer
2f643817a4 LeftAndMain::$session_namespace
More fine-grained control over session storage,
particularly when reusing the "current page" state.
2012-08-29 15:10:05 +02:00
Ingo Schommer
1e5b04ccad Merge branch '7740-re-ordering-page' of git://github.com/phalkunz/sapphire into phalkunz-7740-re-ordering-page 2012-08-29 14:54:49 +02:00
Ingo Schommer
3946a3e991 Merge pull request #746 from phalkunz/7601-listview-sort-by-title
GridFieldSortableHeader now allows composite fields to be sorted based db fields (see #7601)
2012-08-29 05:41:50 -07:00
Ingo Schommer
f070f971cf BUG Allow custom getters in summaryFields() (fixes #7788)
Regression from ca1d38dffd
2012-08-29 13:42:29 +02:00
martimiz
82500dd4c4 NEW Custom menu icons for the CMS main menu
Add optional custom menu icons to the CMS main menu for every class
extending LeftAndMain (ModelAdmin). Works by setting optional static
$menu_icon = '/path/to/image' and providing custom styling for added
icons. Works for the menu as well as icon in the right-side (GridField) pane header.
2012-08-29 13:14:59 +02:00
jean
14759b6ff1 FIX #7787 Handles ajax and normal requests differently when validation fails on gridfields 2012-08-29 13:00:05 +02:00
TeamCity
fbaf743274 Merge remote branch 'origin/master' into translation-staging 2012-08-29 22:46:18 +12:00
Ingo Schommer
a71077c9e9 Merge branch 'aa_function' of git://github.com/simonwelsh/silverstripe-framework into simonwelsh-aa_function 2012-08-29 11:58:02 +02:00
Simon Welsh
78fdcc580b API DataList->leftJoin()/innerJoin() args no longer escaped
The table name in the join was being escaped, though table
names aren't escaped anywhere else. This breaks
namespaced classes, which rely on unescaped backslashes.
2012-08-29 11:54:42 +02:00
Saophalkun Ponlu
c3d622c910 BUG: Fix an issue caused by moving a page from one location in the tree to another location doesn't update parent id in the edit form immediately (see #7740)
The issue causes the moved page to revert to previous location when Save and Publish before any page refresh or page switching.
This commit also adds 'Modified' badge to the moved page
2012-08-29 20:33:03 +12:00
Hamish Friedlander
cc2e250719 NEW Allow querying if a field exists on a table 2012-08-29 15:08:48 +12:00
Zauberfisch
70b22fa4ca API CHANGE: GridFieldConfig should extend object to make use of Object::create() this also fixes GridFieldConfig_RecordViewer::create() which was not working before
but don't extend Object
2012-08-29 12:45:23 +12:00
Sam Minnée
c738744c38 Merge pull request #740 from tractorcow/3.0-route-fixes-alt
FIXED: Issue where route table arguments would not be accessible without using non deprecated API
2012-08-28 17:41:30 -07:00
Sam Minnée
9af4972a0b Merge pull request #749 from sminnee/remove-travis-devbuild
Removed pre-emptive dev/build from travis test run, to make it faster.
2012-08-28 17:20:27 -07:00
Sam Minnee
09e3fa4e6a Removed pre-emptive dev/build from travis test run, to make it faster. 2012-08-29 12:10:58 +12:00
Simon Welsh
9d2686130c Merge cd61b61 from master 2012-08-29 11:18:41 +12:00
Sam Minnée
fcc88264cb Merge pull request #747 from silverstripe-rebelalliance/trac/7763
FIX 7763 TreeDropdownField needs to refresh after CMS edit form save
2012-08-28 15:55:35 -07:00
Hamish Friedlander
05fade3249 FIX 7763 TreeDropdownField needs to refresh after CMS edit form save 2012-08-29 10:52:56 +12:00
TeamCity
19c995f1d2 MINOR Updated translations 2012-08-29 08:05:10 +12:00
Ingo Schommer
6162ae5e3f Fixed preview link ordering in CMS
jQuery seems to order by DOM rather than occurrence of
selectors, which means it always takes the last populated
field (in our case the "live" link over the "draft" link).
2012-08-28 18:31:15 +02:00
Ingo Schommer
b53790eace Fluent API for PaginatedList 2012-08-28 17:28:37 +02:00
Saophalkun Ponlu
e595b8fc75 GridFieldSortableHeader now allows composite fields to be sorted based db fields (see #7601) 2012-08-28 21:15:46 +12:00
TeamCity
378871bd27 Merge remote branch 'origin/master' into translation-staging 2012-08-28 17:13:17 +12:00
Sam Minnee
abbce151d9 Updated Travis-CI configuration to have a 4 build grid.
The Travis config will now run tests on the following instances

 * 5.3 + SQLite
 * 5.3 + MySQL
 * 5.3 + PostgreSQL
 * 5.4 + MySQL

In other words, with the exception of Windows tech (MSSQL + Win server) this is a wide-coverage build config.
2012-08-28 16:25:26 +12:00
Sam Minnee
c2afca2cd8 Merge branch '3.0' 2012-08-28 16:08:57 +12:00
Sam Minnée
93cdb83ac8 Merge pull request #738 from simonwelsh/lsb-53-30
FIX Removes version checking for LSB in Object::static_lookup()
2012-08-27 21:07:29 -07:00
Sam Minnée
5b58e7951c Merge pull request #742 from silverstripe-rebelalliance/7812
BUG: open ticket 7812 correcting filter syntax on a DataObject used by f...
2012-08-27 21:05:09 -07:00
Sam Minnée
881952bf57 Merge pull request #743 from silverstripe-rebelalliance/trac/7817
FIX issue with cyclic configs when framework called sapphire
2012-08-27 21:04:49 -07:00
Hamish Friedlander
26cfd64d8e FIX issue with cyclic configs when framework called sapphire
The _config/route rules explicitly mentioned framework by module name,
so if you installed framework in the older sapphire directory youd
always end up with cyclic config requirement errors
2012-08-28 15:44:40 +12:00
Hamish Friedlander
aa0cd147bf FIX Make config DAG error message more dev friendly 2012-08-28 14:38:33 +12:00
Ingo Schommer
dc08e87bd5 BUG Take first non-empty link field for preview
Goes by priority, but allows for fields to be empty.
This is important e.g. for models which are removed just
from live, or just from draft.
Also reacts to a field rename done in CMS module (62783c75).
2012-08-27 18:22:33 +02:00
TeamCity
f95e710314 MINOR Updated translations 2012-08-28 04:19:12 +12:00
TeamCity
877f48a2c8 MINOR Updated translations 2012-08-28 03:06:49 +12:00
Ingo Schommer
f63893544e BUG Fix CMS layout after preview navigation (fixes #7463) 2012-08-27 16:50:37 +02:00
Ingo Schommer
5a44ea2e20 Deselect tree nodes when reacting to form load event (fixes #7401)
Multiselected nodes are only possible in batch mode,
which would never trigger a form load event.
2012-08-27 16:49:06 +02:00
TeamCity
9ab31253c8 MINOR Updated translations 2012-08-28 02:05:21 +12:00