swcs/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,181 Commits 73 Branches 219 Tags
adc9957504dce78296f70c86557fc47f69af377c
Commit Graph

7925 Commits

Author SHA1 Message Date
Shannon 5ffca11c5b Fixing: U4-2678 Fix logging out and then logging in as another user, the sections, etc... do not get updated. 2013-09-30 18:58:24 +10:00
Shannon 0be07f467f Fixes: U4-2989 Username & password must be changed if login credentials are invalid in order to submit again. 2013-09-30 17:03:26 +10:00
Shannon 1a9ced80f9 Fixes: U4-2974 Authentication fail displays username and password 2013-09-30 16:31:52 +10:00
Shannon fb3bad90d6 had to change port 9999 to 9990 because the new sony vaio admin uses 9999 2013-09-30 14:24:39 +10:00
Shannon cf6ecf5bc9 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-member-editor-wip 
Conflicts:
	src/Umbraco.Web.UI/config/trees.config
 2013-09-30 13:51:18 +10:00
perploug f0692329b6 Moved contentpicker button to bottom 2013-09-27 13:36:59 +02:00
perploug dcb08250ab Minor search visual tweaks 2013-09-27 11:23:38 +02:00
perploug 10b58fbd29 Adds drag drop to media dashboard 2013-09-27 11:22:26 +02:00
perploug 08e21e36a6 minor styling updates 2013-09-27 11:03:01 +02:00
perploug 249015a0e9 Remove non-working doctype add link 2013-09-27 11:02:40 +02:00
Shannon a3d674f574 Updated the saving model and validator inheritance chain to better support members, have the members editor display data and posting/validating data - now need to get the correct fields being displayed and the correct tab/layout but coming along very nicely! 2013-09-27 16:59:38 +10:00
Shannon 82c784d560 Most of the member tree working, have the member editor rendering data 2013-09-27 15:19:39 +10:00
Shannon 7684381326 Fixes issue with media edit controller not having a $timeout reference. 2013-09-27 13:05:57 +10:00
Shannon 6cf689220e Fixed up the log controller & models (based on feedback http://bit.ly/1h6KiJf ) 2013-09-27 09:25:08 +10:00
perploug 51912bd50f Fixes those resizing issues we've been having 2013-09-26 23:07:51 +02:00
perploug afb5139aec enables the super rough search data in navigation 2013-09-26 22:56:01 +02:00
perploug 67a81d7b2d content name directive exit method change 2013-09-26 21:43:55 +02:00
perploug bcac690fd5 Media picker tinymce icon 2013-09-26 21:43:33 +02:00
perploug f2e7cff048 Minor css updates 2013-09-26 15:35:44 +02:00
perploug 0c350e9cc1 Content name directive refactor 2013-09-26 15:35:28 +02:00
perploug 33b4a73794 Beginning work on localization 2013-09-26 15:34:58 +02:00
perploug e52cbf7130 Log resource 2013-09-26 15:34:10 +02:00
Shannon 4212199226 Fixes: U4-2941 Sort dialog YSODs on root node and updates media GetChildren to be the same as content with options/sorting/filtering. 2013-09-26 16:26:05 +10:00
Shannon 18c1ec8ae7 fixed issue with the 'do something else' button 2013-09-26 16:05:42 +10:00
Shannon e1cf3bc597 Implements: U4-2937 A tree item should be able to have a default action 2013-09-26 15:55:38 +10:00
Shannon c9fd168cbd Fixes: U4-2905 Refresh node at tree root (i.e. content/media) doesn't work 2013-09-26 14:28:18 +10:00
Shannon 29d849754c Fixes: U4-2703 Content editor save/publish should update modified attributes 2013-09-26 12:53:33 +10:00
perploug aca64ae08e Fixes: U4-2871 2013-09-25 16:03:34 +02:00
perploug b918462e40 Missing csproj files + minor css updates 2013-09-25 15:39:23 +02:00
perploug 2415e39e43 merge 2013-09-25 15:17:21 +02:00
perploug 123e70ae21 Small tweaks on the macro dialog 2013-09-25 15:15:52 +02:00
perploug 8a3f1e6fbf NH code refactor 
Moved view into directive
Moved dropzone into directive
Reused in media dialog
 2013-09-25 15:15:35 +02:00
perploug 7d50d0fc6c Replaces all the old core dashboards 2013-09-25 15:14:09 +02:00
Shannon d689ad488c Fixes macro rte editor to use the current page id 2013-09-25 21:46:04 +10:00
Tim Geyssens fb811ce810 Embed rte plugin: minor copy update 2013-09-25 12:16:11 +02:00
Tim Geyssens 32ba52f340 rte: adds iframe as allowed element 2013-09-25 12:07:25 +02:00
Tim Geyssens 04275eba63 Embed rte plugin: prettify 2013-09-25 11:51:47 +02:00
Shannon f01e3ee9f2 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-25 19:27:12 +10:00
Tim Geyssens ab2b916103 Embed rte plugin: adds cancel button to dialog 2013-09-25 11:21:10 +02:00
Tim Geyssens b3914c4eaa Embed rte plugin: changes icon 2013-09-25 11:17:32 +02:00
Shannon 5fd25e26f5 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-09-25 19:04:12 +10:00
Shannon 55e9a4fbb0 fixes rte property editor to ensure that data is saved since tinymce events are a bit strange. fixes up selection changes and ensures that macro markup in the editor can never be modified. 2013-09-25 16:30:13 +10:00
Shannon 06400f8db5 Gets the modal content loading in the rte on editor load all in async, fixes an issue with valtogglemsg when used in a modal to ensure we unsubscribe from the events when the modal element is destroyed. 2013-09-25 14:29:59 +10:00
Shannon 6c9fe2ebd0 Adds dynamic filtering to EntityService (post filtering for GetAll) - updated the insert macro dialog to ensure that it only shows macros flagged for the rte when in rte mode, otherwise shows all of them. adds unit tests for dynamic queryable stuff. 2013-09-25 13:54:25 +10:00
Shannon f127d31928 Gets the rte macro contents rendering with macro parameter values. 2013-09-25 12:05:07 +10:00
perploug 3dd583b1d3 Fixes broken table drag n drop 2013-09-24 16:03:09 +02:00
perploug 5c8d027383 Media delete dialog, missing D attr validation 2013-09-24 16:02:58 +02:00
perploug e9f69e39ab Adds folder icons to the photo folder directive 2013-09-24 14:47:06 +02:00
perploug 9a1457fb6d Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-24 12:15:52 +02:00
perploug 828965b902 umb photo folder directive 2013-09-24 12:15:15 +02:00