tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity
3,036 Commits 29 Branches 403 Tags 28 MiB
afdac50ef1
Commit Graph

3036 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stig Lindqvist
fd3e5381a9 Merge branch 'master' of git://github.com/silverstripe/silverstripe-cms 2012-03-09 09:34:34 +13:00
Ingo Schommer
a30a615de4 MINOR Extending CMSFileAddController off LeftAndMain to fix problems with inherited templates (wrong .cms-content styling when requesting via ajax, due to inherited AssetAdmin templates) 2012-03-08 21:18:39 +01:00
Ingo Schommer
1789287bd2 MINOR No longer using iteratorproperties() directly 2012-03-08 20:25:51 +01:00
Ingo Schommer
1d6d24671c Merge branch 'integration' 
Conflicts:
	code/controllers/AssetAdmin.php
 2012-03-08 20:13:53 +01:00
Ingo Schommer
ce5204f2f8 MINOR Respect permission failures from parent implementation in CMSPageHistoryController 2012-03-08 20:02:15 +01:00
Ingo Schommer
79269a22ed MINOR Moved CMSMain->RootForm() to CMSSettingsController (same effect, but clearer structure) 2012-03-08 18:24:35 +01:00
Ingo Schommer
c94308d21d MINOR Implemented "Add new" link in CMSPagesController 2012-03-08 18:24:35 +01:00
Ingo Schommer
953e2bd1c7 MINOR Fixed overloaded delete confirmations in AssetAdmin.js 2012-03-08 18:24:35 +01:00
Ingo Schommer
f085583b61 ENHNANCEMENT Creating folders via (faster) JavaScript prompt in AssetAdmin, implicitly fixing AssetAdmin->doAdd() layout issues after submitting 2012-03-08 18:24:33 +01:00
Ingo Schommer
c226554b5a MINOR Adjusted AssetAdmin to GridFieldAction_ * class renames 2012-03-08 15:25:45 +01:00
jbridson
83aae46236 BUGFIX:SSF-30 - moved tabs SCSS from _style.scss to AssetAdmin.scss 2012-03-08 09:05:14 +13:00
Ingo Schommer
3670fe0530 ENHANCEMENT Show AssetAdmin breadcrumbs+tabs outside of search+editform panels 2012-03-07 17:02:08 +01:00
Ingo Schommer
9981c929e0 MINOR Fixed breadcrumbs in CMSFileAddController 2012-03-07 17:01:08 +01:00
Ingo Schommer
915dc7f27c MINOR Fixed wrong "add folder" css class + behaviour 2012-03-07 14:37:12 +01:00
Ingo Schommer
12124fdae0 MINOR Simplified "Meta" field labelling in SiteTree->getCMSFields() (removed header) 2012-03-07 13:48:52 +01:00
Ingo Schommer
b29a7540a2 MINOR Fixed usage of deprecated FormField->describe() API 2012-03-07 13:32:44 +01:00
jbridson
590027cfe3 ENHANCEMENT:SSF-30 - changed color of add folder button. 2012-03-07 17:33:29 +13:00
Normann Lou
434dbdb286 MINOR SSF-30 : add extra class to Tab (GalleryView) to AssetAdmin EditForm 2012-03-07 16:52:29 +13:00
Normann Lou
ecb31ce30a MINOR SSF-30 : add extra field to Tabs (listView and TreeView) to LeftAndMain EditForm 2012-03-07 14:28:57 +13:00
Stig Lindqvist
df859b7794 Merge branch 'master' of git://github.com/silverstripe/silverstripe-cms 2012-03-07 11:14:34 +13:00
Ingo Schommer
b6f73eb290 MINOR Title for "sync files" button 2012-03-06 11:25:41 +01:00
Julian Seidenberg
adefc15e5a API-CHANGE: SSF-33 Adding "look for new files" trigger. Removing the legacy implementation of SyncForm and replacing it with an implementation that can be triggered via ajax. 2012-03-06 18:22:31 +13:00
jbridson
12c01d45de MINOR:SSF-106 - added padding to the tfoot of the asset admin datagrid (for the styling of pagination) 2012-03-06 15:00:36 +13:00
Sam Minnée
da418d21fc Merge pull request #64 from silverstripe-scienceninjas/feature/ssviewer-enhancements 
BUGFIX: Dont need (and cant call) iteratorProperties calls as workaround...
 2012-03-05 14:07:26 -08:00
Hamish Friedlander
1d608c0b94 BUGFIX: Dont need (and cant call) iteratorProperties calls as workaround any more 2012-03-06 10:15:18 +13:00
Sam Minnée
703ac7b47e Merge pull request #62 from silverstripe-scienceninjas/master 
BUGFIX: SiteTree#getCMSFields would only calculate local variable $linkedPages if ID was valid, but would then refer to that variable regardless
 2012-03-05 13:08:22 -08:00
Ingo Schommer
e0a67a80c7 BUGFIX Restored old permission code model, broken due to new controller structure. Introduced LeftAndMain::$required_permission_codes as a way to control permissions independently of subclasses, and "cluster" multiple classes under a single code. 2012-03-05 18:42:44 +01:00
Ingo Schommer
e938c60e9a ENHANCEMENT Using chosen.js selection instead of a TreeDropdownField to select groups in SiteConfig->getCMSFields() and SiteTree->getCMSFields() 2012-03-05 18:42:42 +01:00
Sam Minnée
26689cdf40 Merge pull request #63 from oddnoc/6828-canonical-tag-virtual-page 
ENHANCEMENT #6828 — Add a canonical link tag to the meta tags of Virtual Pages
 2012-03-02 12:25:58 -08:00
Ingo Schommer
fbbbc9f0bc MINOR Fixed breadcrumbs for CMSSettingsController 2012-03-02 20:45:44 +01:00
Ingo Schommer
d1581c2b9b ENHANCEMENT Refactored AssetAdmin to use SearchContext for filtering records, rather than relying on GridFieldFilter - less coupling to one view (we also have gallery and tree views), and more flexible filtering on columns/criteria which are not present in GridField 2012-03-02 20:45:34 +01:00
Fred Condo
10c171f1bb ENHANCEMENT #6828 (Trac): Add a canonical link tag to the meta tags of Virtual Pages 
See http://support.google.com/webmasters/bin/answer.py?hl=en&answer=139394
 2012-03-02 10:59:15 -08:00
Ingo Schommer
7125af918d BUGFIX Fixed CMSFileAddController upload in custom folders 2012-03-02 15:43:22 +01:00
Ingo Schommer
467db5146b MINOR Removed obnoxious message about tree filtering success (which now became visible as we fixed the statusMessage() system) 2012-03-02 15:23:14 +01:00
Ingo Schommer
75694726d9 MINOR Removed duplicate AssetAdmin.scss file 2012-03-02 15:22:38 +01:00
Ingo Schommer
18e612e65b MINOR Moved CMSMain.GridField.js logic into LeftAndMain.js (applies to all CMS interfaces), fixed event bugs with GridField overloading in AssetAdmin.js 2012-03-01 00:19:34 +01:00
Ingo Schommer
6860c5dd9f MINOR Consolidated AssetAdmin->FilterForm() button styling and labels with CMSMain 2012-02-29 21:06:21 +01:00
Ingo Schommer
ebfc1526ad MINOR Removed duplicate reset CSS from cms 2012-02-29 21:06:02 +01:00
Ingo Schommer
477c319cac Merge branch 'master' into integration 2012-02-28 20:17:49 +01:00
Ingo Schommer
e96d6f5bd5 MINOR Linking breadcrumbs to root node via AssetAdmin->Breadcrumbs() 2012-02-28 20:11:07 +01:00
Ingo Schommer
f78ab9097a MINOR Reinstated getting current record ID from session in AssetAdmin in order to allow routing to GridFieldPopupForms detail views (admin/assets/show/99 vs admin/assets/EditForm/field/...) 2012-02-28 20:10:39 +01:00
Ingo Schommer
a317b66a8a MINOR Merge errors 2012-02-28 16:56:21 +01:00
Andrew O'Neil
80fe9c8864 MINOR: SSF-106 Include cms gridfield javascript hooks 2012-02-28 15:58:19 +01:00
Andrew O'Neil
346b9d06f7 MINOR: SSF-106 Include cms gridfield javascript hooks 2012-02-28 15:05:30 +13:00
Ingo Schommer
aef351466e Merge branch 'master' into integration 2012-02-28 00:35:10 +01:00
Ingo Schommer
5a69985a52 Merge branch '106-add-edit-records' 2012-02-28 00:22:49 +01:00
Ingo Schommer
d09c071899 Merge branch 'master' into integration 
Conflicts:
	templates/Includes/AssetAdmin_Content.ss
 2012-02-24 00:31:36 +01:00
Ingo Schommer
f216c783c6 Merge remote-tracking branch 'silverstripe-scienceninjas/pull/SSF-12' 2012-02-23 23:39:06 +01:00
Ingo Schommer
09fd710dd4 MINOR Combining CSS in CMS, added AssetAdmin styles 2012-02-23 23:15:37 +01:00
Ingo Schommer
7574c3177d MINOR Custom confirm message for deleting folders in AssetAdmin 2012-02-23 23:15:37 +01:00