yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,347 Commits 4 Branches 7 Tags
49164ce6efc75d686a1980770df8c407f22ba7a3
Commit Graph

1842 Commits

Author SHA1 Message Date
Shannon
49164ce6ef Updates move/copy to use the correct usage of checked nodes 2014-10-09 14:31:53 +11:00
Shannon
9cbea5764d fixes umbtreeitem with ng-show instead of ng-if which wasn't working for the copy dialog for some reason 2014-10-09 13:39:10 +11:00
Shannon
f8503b4c68 Fixes (and massively simplifies) the member group picker to use the correct way of using checks in tree nodes 2014-10-09 12:51:07 +11:00
Shannon
0ff1c9915d Updates tree to natively support check boxes as an option, same with search icons, fixes tree directive to pass the current tree scope correctly, removes the requirement for the cache key on the umbtreeitem directive. Fixes the link picker to use the correct way to show check boxes instead of hacking with jquery. 2014-10-09 12:36:52 +11:00
Shannon
c58a9429e1 Member picker now using standard treePicker and search is working 2014-10-09 11:08:09 +11:00
Shannon
18efe25167 removes unneeded contentpicker dialog and just uses the standard tree picker that has the correct search built in, now search is working for the link picker. 2014-10-09 00:04:25 +11:00
Shannon
05d5e981af Search working pretty nicely with tree picker and list views, now to get it working like this consistently for all of them. 2014-10-08 23:24:27 +11:00
Shannon
8136b3ecb0 Got searching working from a particular node id, got the UI nearly working 2014-10-08 19:03:45 +11:00
Shannon
c61c130ddf WIP: working on tree picker with search for list views 2014-10-08 14:35:57 +11:00
Shannon
818c699d60 WIP: working on tree picker with search for list views. updates all pickers to ensure that they unbind any events. 2014-10-08 14:26:18 +11:00
Shannon
7296643f2d Fixes remaining link picker issue: U4-4974 Umbraco v7.1.3 - Users cannot insert images in RTE 2014-10-08 09:29:52 +11:00
per ploug
b6fd0489e2 Renames canvas editor into grid again 2014-10-07 13:39:18 +02:00
Shannon
ec30251271 Fixes most tree pickers to show/hide the header correctly, updates the entitycontroller to be able to search from a start node and use the user's assigned start node if one is not passed in. Ensure the search bar is visible for the treepicker at all times. Now to get the remaining bits working... 2014-10-07 17:22:26 +11:00
Shannon Deminick
173d298d21 Merge pull request #503 from arknu/angular-test-fixes 
U4-5589: Fix broken Angular app test setup
 2014-10-07 16:38:50 +11:00
Shannon
98eeaca5d5 Fixes: U4-5597 ServerVariables cannot include dynamic data like a users start node Ids 2014-10-07 14:59:07 +11:00
Shannon
7a172c4253 Fixes: U4-4974 Umbraco v7.1.3 - Users cannot insert images in RTE 2014-10-07 14:08:22 +11:00
Shannon
b28f1d86c9 Merge branch '7.1.8' into 7.2.0 2014-10-07 12:57:47 +11:00
Shannon
8824ab2b27 reverts JS from tree controller and updates the c# method to create the tree child node URLs to ensure the custom start node param is ignored, this is a bit cleaner. 2014-10-07 12:52:02 +11:00
Shannon
b60e292d5f Fixes: U4-5578 MNTP with root node, recursive output 2014-10-07 11:51:11 +11:00
Shannon Deminick
9058358004 Merge pull request #501 from Alain-es/U4-5400-Bugfix 
U4-5400 BugFix
 2014-10-07 10:14:57 +11:00
per ploug
6d4deb8da5 Fixes U4-5531 7.2.0 Nightly: Preview of desktop, height is 150px 2014-10-06 13:54:30 +02:00
per ploug
4da98c1697 temp forms copy 2014-10-06 13:31:43 +02:00
per ploug
7ae9a2bda6 Canvas add delay to overlay 2014-10-06 11:55:34 +02:00
arknu
95c4fb740a Fix broken Angular app test setup 2014-10-04 23:37:46 +02:00
Alain-es
ad4b90dbe5 U4-5400 BugFix 
BugFix: U4-5400 Tags Data Type Doesn't Always Auto-Complete/Typeahead.
New feature: Filters the shown list items to not show the tags that are
currently selected.
 2014-10-04 08:48:04 +02:00
antoine
0ce83630d7 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-10-03 09:45:19 +02:00
antoine
bc733132a6 Right ng-include for the canvas additem 2014-10-03 09:44:50 +02:00
Shannon
cc9ca02843 Merge branch 'BatJan-7.1.5-localizatiob-5025' into 7.2.0 
Conflicts:
	src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
 2014-10-03 13:29:04 +10:00
Shannon
12e49f186e Merge branch '7.1.5-localizatiob-5025' of https://github.com/BatJan/Umbraco-CMS into BatJan-7.1.5-localizatiob-5025 
Conflicts:
	src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js
	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
	src/Umbraco.Web.UI/umbraco/config/lang/es.xml
	src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
	src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
 2014-10-03 13:28:02 +10:00
Shannon
a0602e6b2a merges PR #243 2014-10-03 13:03:52 +10:00
Shannon
c078a1c12f Merge branch 'U4-5512' of https://github.com/arknu/Umbraco-CMS into arknu-U4-5512 
Conflicts:
	src/Umbraco.Web.UI.Client/src/controllers/main.controller.js
 2014-10-03 13:01:00 +10:00
Shannon Deminick
cce63d6eaa Merge pull request #498 from AndyButland/u4-5461 
U4-5461 - Further amends to date picker behaviour
 2014-10-03 09:21:23 +10:00
AndyButland
3090339962 Removed incorrect option value 2014-10-02 22:08:19 +02:00
AndyButland
d9074da3fd Removed close of date/time picker on date selection when set up with time picker; close picker on click on document 2014-10-02 22:02:41 +02:00
Shannon
1c16764605 Merge branch '7.2.0_progressbar' of https://github.com/bjarnef/Umbraco-CMS into bjarnef-7.2.0_progressbar 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
	src/Umbraco.Web.UI/umbraco/developer/Packages/installedPackage.aspx
	src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx
	src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx
 2014-10-02 21:46:39 +10:00
Shannon Deminick
69494c20f4 Merge pull request #491 from AndyButland/u4-5461 
U4-5461 - Close date picker once date is selected
 2014-10-02 21:18:21 +10:00
Shannon Deminick
caa0e82d77 Merge pull request #495 from AndyButland/u4-5012 
U4-5012 Moved preview step for RTE embed dialog to a button press
 2014-10-02 21:16:44 +10:00
Shannon
b90f28731c Ensures the return to list button isn't shown on items in the recycle bin since that would navigate back to their original parent. Updates the recycle bin list views to respect the list view configuration of their associated sections. 2014-10-02 19:55:24 +10:00
Shannon
c8264cff1e Updates the content type editor to have the list view customization inline instead of in a dialog. 2014-10-02 18:52:38 +10:00
Shannon
3400c52e45 Fixes: U4-5443 Unable to add images using markdown editor, U4-5442 Markdown editor breaks on navigation 2014-10-02 13:18:35 +10:00
antoine
2380217c21 Very Basic shadow for the canvas designer 2014-10-01 18:28:25 +02:00
antoine
1231975a78 Bad path refer to grid instead of canvas 2014-10-01 18:27:35 +02:00
antoine
14e241bf21 Layout Editor editor without default box value 2014-10-01 18:26:57 +02:00
antoine
50d3b81ed9 Blank font style issue in canvas designer google font editor 2014-10-01 12:57:33 +02:00
antoine
371e4382cb set a no disposable unique row ID for row styling 2014-10-01 12:56:45 +02:00
antoine
45dde8717b Canvas designer Color editor issue 2014-10-01 12:55:32 +02:00
AndyButland
af256e754d Moved preview step for RTE embed dialog to a button press 2014-10-01 11:28:00 +02:00
antoine
4021b680f8 No more dependency with bootstrap and some comments in less file 2014-09-30 21:39:51 +02:00
antoine
2733dc3129 Canvas grid row editor 2014-09-30 21:38:41 +02:00
antoine
97ed172472 Canvas designer Selector based on schema instead of name 2014-09-30 21:38:05 +02:00