Revision e4d088e7
| ID | e4d088e762af76f9dfa0330f34eb132b6f01f85f |
Revert unwanted merge from master into branche/2.3: "Merge branch 'branches/rudder/2.3' of github.com:Normation/rudder into branches/rudder/2.3"
This reverts commit 96cc497c9a1378493cc3fc78ae45a4ecc04dbdc1, reversing
changes made to 2e64e71dfaf8cf3b263fa9d7545a7ae82f8939e2.
Files
- added
- modified
- copied
- renamed
- deleted
- README.asciidoc
- rudder-web
- src
- main
- resources
- scala
- com
- normation
- rudder
- web
- comet
- components
- model
- services
- snippet
- AcceptServer.scala (diff)
- ConfigurationRuleManagement.scala (diff)
- EmergencyStop.scala (diff)
- EventLogsViewer.scala (diff)
- Groups.scala (diff)
- PendingHistoryGrid.scala (diff)
- PolicyInstanceManagement.scala (diff)
- PolicyTemplateLibraryManagement.scala (diff)
- Reports.scala (diff)
- UserInformation.scala (diff)
- web
- rudder
- normation
- com
- webapp
- images
- PuceMenuCachee.jpg
- btnAccept.jpg
- btnAlert.jpg
- deploying.gif
- fdBtnUpdate.jpg
- fondBody.jpg
- fondMenu.jpg
- fondMenuAux.jpg
- fondPortlet.jpg
- fondTitMenu.jpg
- icCroix.jpg
- icError.jpg
- icLoupe.jpg
- icOK.png
- icPolicies.jpg
- icValid.jpg
- icWarn.png
- icfail.png
- imgPortlet.jpg
- login
- btnLogin.jpg
- fondLogin.jpg
- logoRudder.jpg
- menuFdDroite.jpg
- menuFdGauche.jpg
- pointilles.jpg
- popin
- croix.png
- fdLoginCroix.png
- fdLoginFootD.png
- fdLoginFootG.png
- fdLoginHead.png
- puceFlecheHover.jpg
- puceFlecheHoverNiv1.jpg
- puceHide.jpg
- puceMenuGrise.jpg
- puceNiv2.jpg
- rudder-favicon.ico
- tableau
- cCentrebas.jpg
- cDbas.jpg
- cDhaut.jpg
- cGbas.jpg
- cGhaut.jpg
- fdTaboHead.jpg
- flecheBas.png
- flecheDroite.png
- flecheGauche.png
- flecheHaut.png
- themes
- base
- images
- ui-bg_flat_0_aaaaaa_40x100.png
- ui-bg_flat_75_ffffff_40x100.png
- ui-bg_glass_55_fbf9ee_1x400.png
- ui-bg_glass_65_ffffff_1x400.png
- ui-bg_glass_75_dadada_1x400.png
- ui-bg_glass_75_e6e6e6_1x400.png
- ui-bg_glass_95_fef1ec_1x400.png
- ui-bg_highlight-soft_75_cccccc_1x100.png
- ui-icons_222222_256x240.png
- ui-icons_2e83ff_256x240.png
- ui-icons_454545_256x240.png
- ui-icons_888888_256x240.png
- ui-icons_cd0a0a_256x240.png
- jquery.ui.accordion.css
- jquery.ui.all.css
- jquery.ui.autocomplete.css
- jquery.ui.base.css
- jquery.ui.button.css
- jquery.ui.core.css
- jquery.ui.datepicker.css
- jquery.ui.dialog.css
- jquery.ui.progressbar.css
- jquery.ui.resizable.css
- jquery.ui.selectable.css
- jquery.ui.slider.css
- jquery.ui.tabs.css
- jquery.ui.theme.css
- images
- ui-lightness
- images
- fdLoginCroix.png
- ui-bg_diagonals-thick_18_b81900_40x40.png
- ui-bg_diagonals-thick_20_666666_40x40.png
- ui-bg_flat_10_000000_40x100.png
- ui-bg_glass_100_f6f6f6_1x400.png
- ui-bg_glass_100_fdf5ce_1x400.png
- ui-bg_glass_65_ffffff_1x400.png
- ui-bg_gloss-wave_35_f6a828_500x100.png
- ui-bg_highlight-soft_100_eeeeee_1x100.png
- ui-bg_highlight-soft_75_ffe45c_1x100.png
- ui-icons_222222_256x240.png
- ui-icons_228ef1_256x240.png
- ui-icons_ef8c08_256x240.png
- ui-icons_ffd27a_256x240.png
- ui-icons_ffffff_256x240.png
- jquery-ui-1.8.7.custom.css
- jquery.ui.accordion.css
- jquery.ui.all.css
- jquery.ui.autocomplete.css
- jquery.ui.base.css
- jquery.ui.button.css
- jquery.ui.core.css
- jquery.ui.datepicker.css
- jquery.ui.dialog.css
- jquery.ui.progressbar.css
- jquery.ui.resizable.css
- jquery.ui.selectable.css
- jquery.ui.slider.css
- jquery.ui.tabs.css
- jquery.ui.theme.css
- images
- base
- tree
- blueprint_16x16.png
- configuration_rule_16x16.png
- folder_16x16.png
- policy_16x16.gif
- server_group_16x16.gif
- special_target_16x16.gif
- img
- PuceMenuCachee.jpg
- btnAccept.jpg
- btnAlert.jpg
- btnClose.jpg
- close.png
- deploying.gif
- fdBtnUpdate.jpg
- flecheMenuDer.jpg
- fondBody.jpg
- fondMenu.jpg
- fondMenuAux.jpg
- fondMenuAux2.jpg
- fondPortlet.jpg
- fondTitMenu.jpg
- icCroix.jpg
- icError.jpg
- icLoupe.jpg
- icOK.png
- icPolicies.jpg
- icValid.jpg
- icWarn.png
- icfail.png
- imgPortlet.jpg
- login
- logoRudder.jpg
- menuFdDroite.jpg
- menuFdGauche.jpg
- photoUser.jpg
- pointilles.jpg
- popin
- puceFlecheHover.jpg
- puceFlecheHoverNiv1.jpg
- puceHide.jpg
- puceMenuGrise.jpg
- puceMenuOrange.jpg
- puceNiv2.jpg
- rudder-favicon.ico
- tableau
- themes
- base
- images
- ui-bg_flat_0_aaaaaa_40x100.png
- ui-bg_flat_75_ffffff_40x100.png
- ui-bg_glass_55_fbf9ee_1x400.png
- ui-bg_glass_65_ffffff_1x400.png
- ui-bg_glass_75_dadada_1x400.png
- ui-bg_glass_75_e6e6e6_1x400.png
- ui-bg_glass_95_fef1ec_1x400.png
- ui-bg_highlight-soft_75_cccccc_1x100.png
- ui-icons_222222_256x240.png
- ui-icons_2e83ff_256x240.png
- ui-icons_454545_256x240.png
- ui-icons_888888_256x240.png
- ui-icons_cd0a0a_256x240.png
- jquery.ui.accordion.css
- jquery.ui.all.css
- jquery.ui.autocomplete.css
- jquery.ui.base.css
- jquery.ui.button.css
- jquery.ui.core.css
- jquery.ui.datepicker.css
- jquery.ui.dialog.css
- jquery.ui.progressbar.css
- jquery.ui.resizable.css
- jquery.ui.selectable.css
- jquery.ui.slider.css
- jquery.ui.tabs.css
- jquery.ui.theme.css
- images
- ui-lightness
- images
- fdLoginCroix.png
- ui-bg_diagonals-thick_18_b81900_40x40.png
- ui-bg_diagonals-thick_20_666666_40x40.png
- ui-bg_flat_10_000000_40x100.png
- ui-bg_glass_100_f6f6f6_1x400.png
- ui-bg_glass_100_fdf5ce_1x400.png
- ui-bg_glass_65_ffffff_1x400.png
- ui-bg_gloss-wave_35_f6a828_500x100.png
- ui-bg_highlight-soft_100_eeeeee_1x100.png
- ui-bg_highlight-soft_75_ffe45c_1x100.png
- ui-icons_222222_256x240.png
- ui-icons_228ef1_256x240.png
- ui-icons_ef8c08_256x240.png
- ui-icons_ffd27a_256x240.png
- ui-icons_ffffff_256x240.png
- jquery-ui-1.8.7.custom.css
- jquery.ui.accordion.css
- jquery.ui.all.css
- jquery.ui.autocomplete.css
- jquery.ui.base.css
- jquery.ui.button.css
- jquery.ui.core.css
- jquery.ui.datepicker.css
- jquery.ui.dialog.css
- jquery.ui.progressbar.css
- jquery.ui.resizable.css
- jquery.ui.selectable.css
- jquery.ui.slider.css
- jquery.ui.tabs.css
- jquery.ui.theme.css
- images
- base
- tree
- index.html (diff)
- javascript
- jquery.history.js (diff)
- slickboxShowHide.js (diff)
- tree.js (diff)
- treeM.js
- secure
- style
- templates-hidden
- images
- main
- src
