tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-06-26 14:39:27 +02:00
Code Issues Projects Releases Wiki Activity
4,677 Commits 30 Branches 398 Tags 25 MiB
ddd6111755
Commit Graph

62 Commits

Author SHA1 Message Date
Damian Mooyman
7dfe145412 Merge remote-tracking branch 'origin/3' 
# Conflicts:
#	code/controllers/CMSFileAddController.php
#	code/controllers/CMSPageAddController.php
#	code/controllers/CMSPageHistoryController.php
#	code/controllers/CMSSiteTreeFilter.php
#	code/controllers/ContentController.php
#	code/controllers/LeftAndMainPageIconsExtension.php
#	code/controllers/SilverStripeNavigator.php
#	code/model/SiteTreeFileExtension.php
#	code/model/VirtualPage.php
#	composer.json
#	tests/model/ErrorPageTest.yml
#	tests/model/FileLinkTrackingTest.yml
#	tests/model/VirtualPageTest.yml
 2016-01-20 13:16:43 +13:00
Sam Minnee
bbc3aaaf9f MINOR: Remove training whitespace. 
The main benefit of this is so that authors who make use of
.editorconfig don't end up with whitespace changes in their PRs.

Spaces vs. tabs has been left alone, although that could do with a
tidy-up in SS4 after the switch to PSR-1/2.

The command used was this:

for match in '*.ss' '*.css' '*.scss' '*.html' '*.yml' '*.php' '*.js' '*.csv' '*.inc' '*.php5'; do
	find . -path ./thirdparty -prune -o -type f -name "$match" -exec sed -i '' 's/[[:space:]]\+$//' {} \+
	find . -path ./thirdparty -prune -o -type f -name "$match" | xargs perl -pi -e 's/ +$//'
done
 2016-01-07 10:32:05 +13:00
scott1702
6dc3fc1f26 Update asset admin toolbar 2015-10-30 10:05:51 +13:00
David Craig
1ea22c766c Move UI to main assets area 2015-09-29 09:35:28 +13:00
Loz Calver
0a0ea33f58 FIX: Prevent AssetAdmin duplicate confirmation for file deletion (fixes silverstripe/silverstripe-framework#2639) 2013-12-17 09:54:14 +00:00
Sam Minnee
bfe354de5e BUGFIX: Disable javascript not used right now because assets don't have batch actions. (Trac #7367) 2012-06-15 15:50:11 +12:00
Ingo Schommer
e99b2e9d31 MINOR Bubbling up GridField row edit event in AssetAdmin.js so default behaviour for files (not folders) can kick in 2012-06-05 13:46:22 +02:00
Mateusz Uzdowski
b2468eb354 BUGFIX: add missing selectors and namespace qualifiers 2012-05-22 11:28:27 +12:00
Mateusz Uzdowski
b75483e1da BUGFIX: add missing _super calls to all matchers and unmatchers 
Otherwise some matchers might not be triggered as expected.
 2012-05-18 12:23:30 +12:00
Ingo Schommer
e91d49036b MINOR Using loadPanel() rather than removed duplicate loadForm() method 2012-04-12 23:55:37 +02:00
Ingo Schommer
059137290f MINOR Correct confirmation message when deleting files (#6975) 2012-03-09 21:12:22 +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
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
a317b66a8a MINOR Merge errors 2012-02-28 16:56:21 +01:00
Ingo Schommer
7574c3177d MINOR Custom confirm message for deleting folders in AssetAdmin 2012-02-23 23:15:37 +01:00
Ingo Schommer
c32595d1c8 MINOR Fixed selector for changed ".ss-gridfield" DOM structure 2012-02-23 23:15:37 +01:00
Ingo Schommer
eb63384900 MINOR Loading folders in AssetAdmin via panel ajax loading 2012-02-21 21:17:49 +01:00
Ingo Schommer
5de2ba5628 MINOR Removing executable flag from all files (thanks miiihi) 2011-09-18 22:04:42 +02:00
Ingo Schommer
c4c3d21fa9 MINOR Using Form->forTemplate() to include <form> tags in controller actions on AssetAdmin and CMSMain (underlying clientside logic has changed) 2011-07-08 15:36:30 +02:00
Ingo Schommer
d48f21afc0 MINOR Renamed #sitetree_ul to .cms-tree in JavaScript logic (changed in LeftAndMain.ss base template) 2011-04-28 22:49:33 +12:00
Ingo Schommer
4fe07e9b71 MINOR Using '.cms-edit-form' instead of '#Form_EditForm' selector 2011-04-28 22:48:55 +12:00
Ingo Schommer
a27369978d BUGFIX Fixed AssetAdmin->SyncForm() execution by switching from calling dev/tasks/FilesystemSyncTask to doSync() 2011-03-16 14:19:03 +13:00
Ingo Schommer
ecbee33385 ENHANCEMENT Moved cms/javascript documentation from JSDoc to NaturalDocs format 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@104369 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-08 02:45:05 +00:00
Ingo Schommer
168589a59f MINOR Updated jQuery.concrete references to point to the new "entwine" name 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102697 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-13 05:55:56 +00:00
Ingo Schommer
990ae9f145 BUGFIX Fixed CMSMain.js search clearing logic, wasnt clearing the first field properly. Fixed LeftAndMain->getsubtree() filtering in AssetAdmin and SecurityAdmin. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92849 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:21:03 +00:00
Ingo Schommer
4d60aa5c83 MINOR Adjusted CMS JavaScript to new jquery-concrete API: Getters have 'get' prefix, namespaces are defined in blocks, event handlers work consistently. Mostly indentation and structure changes, no logic changes. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92825 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:19:59 +00:00
Ingo Schommer
f15e2d8da3 ENHANCEMENT Reloading current edit form after 'look for new files' in AssetAdmin 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92819 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:19:43 +00:00
Ingo Schommer
615494f123 MINOR Wrapped AssetAdmin.BatchActions javascript in document.load 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92818 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:19:41 +00:00
Ingo Schommer
175ceaf890 MINOR Moved AddForm javascript logic to new LeftAndMain.AddForm.js file which is shared by CMSMain and AssetAdmin 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92810 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:19:25 +00:00
Ingo Schommer
284de94770 MINOR Moved some form logic from AssetAdmin.js to AssetTableField.js 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92808 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:19:18 +00:00
Ingo Schommer
f4e2dcb61a MINOR Removed deletefolder javascript in AssetAdmin.js, superseded by LeftAndMain.BatchActions.js 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92807 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:19:15 +00:00
Ingo Schommer
18f54bb99a MINOR Added javascript confirmation for 'delete folders' batch action in AssetAdmin.js 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92806 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:19:14 +00:00
Ingo Schommer
dd52d7a804 ENHANCEMENT Removed CheckboxRange javascript from AssetAdmin.js, unnecessary complication of the UI with legacy prototypejs-based code. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92805 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:19:12 +00:00
Ingo Schommer
067b7bcaeb ENHANCEMENT Changed AssetAdmin interface 'delete' action to behave same as main CMS interface: Show 'batch actions' with dropdown. Added AssetAdmin_DeleteBatchAction class. 
ENHANCEMENT Moved 'Sync files' action in AssetAdmin from toplevel tab to the bottom of the tree and hooked up to AssetAdmin->SyncForm to avoid hardcoding the URL.
ENHANCEMENT Changed AssetAdmin interface 'create' button to show dialog and 'go' button, and behave similar to the main CMS interface

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92802 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:19:05 +00:00
Ingo Schommer
a9adcbefaa MINOR Overloading 'create' button for AssetAdmin.js to perform action instead of opening a tab. 
MINOR Moved drag/drop functionality into new AssetAdmin.DragDrop.js location (will most likely be temporary until we switch to jQuery drag/drop)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92787 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:18:25 +00:00
Ingo Schommer
1ce99bc5c4 MINOR Removed unused refreshAsset() javascript from AssetAdmin.js 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92782 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:18:08 +00:00
Ingo Schommer
927c28baad MINOR Removed 'delete unused items' javascript from AssetAdmin.js 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92781 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:18:06 +00:00
Ingo Schommer
758804eacf API CHANGE Removed ajaxErrorHandler() javascript method from LeftAndMain.js, and changed two known references to custom code 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92736 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:16:21 +00:00
Ingo Schommer
60451f7033 API CHANGE Replaced addpageclass javascript functionality with concrete implementation in CMSMain_left.js 
MINOR Renaming load() to loadForm() in LeftAndMain.EditForm.js, to avoid overloading jQuery's native methods
MINOR Triggering jQuery events on top of prototype's Observable for better handling with concrete, in SecurityAdmin.js

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92719 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:15:32 +00:00
Ingo Schommer
fef2f77b09 MINOR Removed unused action_upload_right() and save() overloading in AssetAdmin.js 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92709 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:15:08 +00:00
Ingo Schommer
81fe7a2f10 MINOR Removed loader.js dependencies 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92628 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 02:37:27 +00:00
Ingo Schommer
df79a947a3 MINOR Removed usage of deprecated ajaxLink() javascript method in AssetAdmin.js 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92597 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 02:35:54 +00:00
Sean Harvey
b2fe474fde ENHANCEMENT Return the results of the FilesystemSyncTask to the status message in the CMS instead of a generic success message (from r82618) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@89813 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-21 04:34:41 +00:00
Sam Minnee
085d2e2cb0 BUGFIX #4328: Fixed drag and drop of files 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@81001 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-07-05 21:18:35 +00:00
Sam Minnee
9bc3f5fe2a ENHANCEMENT: Added manual Filesystem::sync() button to improve load time of admin/assets area. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@80783 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-07-01 22:28:06 +00:00
Sean Harvey
42a6692d79 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@75592 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-04-29 01:44:28 +00:00
Sean Harvey
34a50e3de6 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71276 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-02-03 03:46:15 +00:00
Sean Harvey
3680bbea46 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71264 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-02-03 03:22:20 +00:00
Sean Harvey
3d4630a2c8 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71259 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-02-03 02:50:25 +00:00