author | Giulio Cesare Solaroli <giulio.cesare@clipperz.com> | 2012-03-17 21:28:40 (UTC) |
---|---|---|
committer | Giulio Cesare Solaroli <giulio.cesare@clipperz.com> | 2012-03-17 21:28:40 (UTC) |
commit | 12cd9d47a6e1c8f8dad28d53a261412218ace6d3 (patch) (unidiff) | |
tree | 42fe98603849248c0d3943fd1d79135a734811c9 /frontend/gamma | |
parent | 25029b943781850c76fbf43827af0204f35a98bf (diff) | |
parent | d791e1df1f701c1fe523f05a8521c4ad1cf032b5 (diff) | |
download | clipperz-12cd9d47a6e1c8f8dad28d53a261412218ace6d3.zip clipperz-12cd9d47a6e1c8f8dad28d53a261412218ace6d3.tar.gz clipperz-12cd9d47a6e1c8f8dad28d53a261412218ace6d3.tar.bz2 |
Merge branch 'buildFix' of https://github.com/jokajak/password-manager
Conflicts:
frontend/gamma/properties/gamma.properties.json
-rw-r--r-- | frontend/gamma/properties/gamma.properties.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/frontend/gamma/properties/gamma.properties.json b/frontend/gamma/properties/gamma.properties.json index 0a513e8..c847812 100644 --- a/frontend/gamma/properties/gamma.properties.json +++ b/frontend/gamma/properties/gamma.properties.json | |||
@@ -95,97 +95,97 @@ | |||
95 | "Clipperz/PM/DataModel/OneTimePassword.js", | 95 | "Clipperz/PM/DataModel/OneTimePassword.js", |
96 | 96 | ||
97 | "Clipperz/PM/UI/Canvas/Marks/exclamationMark.js", | 97 | "Clipperz/PM/UI/Canvas/Marks/exclamationMark.js", |
98 | "Clipperz/PM/UI/Canvas/Marks/questionMark.js", | 98 | "Clipperz/PM/UI/Canvas/Marks/questionMark.js", |
99 | "Clipperz/PM/UI/Canvas/Marks/info.js", | 99 | "Clipperz/PM/UI/Canvas/Marks/info.js", |
100 | 100 | ||
101 | "Clipperz/PM/UI/Canvas/Features/store.js", | 101 | "Clipperz/PM/UI/Canvas/Features/store.js", |
102 | "Clipperz/PM/UI/Canvas/Features/protect.js", | 102 | "Clipperz/PM/UI/Canvas/Features/protect.js", |
103 | "Clipperz/PM/UI/Canvas/Features/directLogin.js", | 103 | "Clipperz/PM/UI/Canvas/Features/directLogin.js", |
104 | "Clipperz/PM/UI/Canvas/Features/share.js", | 104 | "Clipperz/PM/UI/Canvas/Features/share.js", |
105 | 105 | ||
106 | "Clipperz/PM/UI/Canvas/Star/normal.js", | 106 | "Clipperz/PM/UI/Canvas/Star/normal.js", |
107 | 107 | ||
108 | "Clipperz/PM/UI/Canvas/CoverActions/look.js", | 108 | "Clipperz/PM/UI/Canvas/CoverActions/look.js", |
109 | "Clipperz/PM/UI/Canvas/CoverActions/download.js", | 109 | "Clipperz/PM/UI/Canvas/CoverActions/download.js", |
110 | 110 | ||
111 | "Clipperz/PM/UI/Canvas/Tips/open.js", | 111 | "Clipperz/PM/UI/Canvas/Tips/open.js", |
112 | "Clipperz/PM/UI/Canvas/Tips/close.js", | 112 | "Clipperz/PM/UI/Canvas/Tips/close.js", |
113 | 113 | ||
114 | "Clipperz/PM/UI/Canvas/RegisterButton/normal.js", | 114 | "Clipperz/PM/UI/Canvas/RegisterButton/normal.js", |
115 | 115 | ||
116 | "Clipperz/PM/UI/Canvas/Logo/normal.js", | 116 | "Clipperz/PM/UI/Canvas/Logo/normal.js", |
117 | 117 | ||
118 | "Clipperz/PM/UI/Canvas/GraphicFunctions.js", | 118 | "Clipperz/PM/UI/Canvas/GraphicFunctions.js", |
119 | 119 | ||
120 | "Clipperz/PM/UI/Common/Components/BaseComponent.js", | 120 | "Clipperz/PM/UI/Common/Components/BaseComponent.js", |
121 | "Clipperz/PM/UI/Common/Components/Button.js", | 121 | "Clipperz/PM/UI/Common/Components/Button.js", |
122 | "Clipperz/PM/UI/Common/Components/ComponentSlot.js", | 122 | "Clipperz/PM/UI/Common/Components/ComponentSlot.js", |
123 | "Clipperz/PM/UI/Common/Components/FaviconComponent.js", | 123 | "Clipperz/PM/UI/Common/Components/FaviconComponent.js", |
124 | "Clipperz/PM/UI/Common/Components/PasswordEntropyDisplay.js", | 124 | "Clipperz/PM/UI/Common/Components/PasswordEntropyDisplay.js", |
125 | "Clipperz/PM/UI/Common/Components/ProgressBar.js", | 125 | "Clipperz/PM/UI/Common/Components/ProgressBar.js", |
126 | "Clipperz/PM/UI/Common/Components/SimpleMessagePanel.js", | 126 | "Clipperz/PM/UI/Common/Components/SimpleMessagePanel.js", |
127 | "Clipperz/PM/UI/Common/Components/MessagePanelWithProgressBar.js", | 127 | "Clipperz/PM/UI/Common/Components/MessagePanelWithProgressBar.js", |
128 | "Clipperz/PM/UI/Common/Components/TabPanelComponent.js", | 128 | "Clipperz/PM/UI/Common/Components/TabPanelComponent.js", |
129 | "Clipperz/PM/UI/Common/Components/Tooltip.js", | 129 | "Clipperz/PM/UI/Common/Components/Tooltip.js", |
130 | "Clipperz/PM/UI/Common/Components/TranslatorWidget.js", | 130 | "Clipperz/PM/UI/Common/Components/TranslatorWidget.js", |
131 | 131 | ||
132 | "Clipperz/PM/UI/Common/Controllers/DirectLoginRunner.js", | 132 | "Clipperz/PM/UI/Common/Controllers/DirectLoginRunner.js", |
133 | "Clipperz/PM/UI/Common/Controllers/ProgressBarController.js", | 133 | "Clipperz/PM/UI/Common/Controllers/ProgressBarController.js", |
134 | "Clipperz/PM/UI/Common/Controllers/TabPanelController.js", | 134 | "Clipperz/PM/UI/Common/Controllers/TabPanelController.js", |
135 | "Clipperz/PM/UI/Common/Controllers/WizardController.js", | 135 | "Clipperz/PM/UI/Common/Controllers/WizardController.js", |
136 | 136 | ||
137 | "Clipperz/PM/UI/Web/Components/Page.js", | 137 | "Clipperz/PM/UI/Web/Components/Page.js", |
138 | "Clipperz/PM/UI/Web/Components/PageHeader.js", | 138 | "Clipperz/PM/UI/Web/Components/PageHeader.js", |
139 | "Clipperz/PM/UI/Web/Components/PageFooter.js", | 139 | "Clipperz/PM/UI/Web/Components/PageFooter.js", |
140 | "Clipperz/PM/UI/Web/Components/LoginPage.js", | 140 | "Clipperz/PM/UI/Web/Components/LoginPage.js", |
141 | "Clipperz/PM/UI/Web/Components/LoginForm.js", | 141 | "Clipperz/PM/UI/Web/Components/LoginForm.js", |
142 | "Clipperz/PM/UI/Web/Components/LoginProgress.js", | 142 | "Clipperz/PM/UI/Web/Components/LoginProgress.js", |
143 | "Clipperz/PM/UI/Web/Components/AppPage.js", | 143 | "Clipperz/PM/UI/Web/Components/AppPage.js", |
144 | "Clipperz/PM/UI/Web/Components/UserInfoBox.js", | 144 | "Clipperz/PM/UI/Web/Components/UserInfoBox.js", |
145 | "Clipperz/PM/UI/Web/Components/TabSidePanel.js", | 145 | "Clipperz/PM/UI/Web/Components/TabSidePanel.js", |
146 | "Clipperz/PM/UI/Web/Components/GridComponent.js", | 146 | "Clipperz/PM/UI/Web/Components/GridComponent.js", |
147 | 147 | ||
148 | "Clipperz/PM/UI/Web/Components/ColumnManager.js", | 148 | "Clipperz/PM/UI/Web/Components/ColumnManager.js", |
149 | "Clipperz/PM/UI/Web/Components/TextColumnManager.js", | 149 | "Clipperz/PM/UI/Web/Components/TextColumnManager.js", |
150 | "Clipperz/PM/UI/Web/Components/FaviconColumnManager.js", | 150 | "Clipperz/PM/UI/Web/Components/FaviconColumnManager.js", |
151 | "Clipperz/PM/UI/Web/Components/ImageColumnManager.js", | 151 | "Clipperz/PM/UI/Web/Components/ImageColumnManager.js", |
152 | "Clipperz/PM/UI/Web/Components/DateColumnManager.js", | 152 | "Clipperz/PM/UI/Web/Components/DateColumnManager.js", |
153 | "Clipperz/PM/UI/Web/Components/LinkColumnManager.js", | 153 | "Clipperz/PM/UI/Web/Components/LinkColumnManager.js", |
154 | "Clipperz/PM/UI/Web/Components/DirectLoginColumnManager.js", | 154 | "Clipperz/PM/UI/Web/Components/DirectLoginColumnManager.js", |
155 | "Clipperz/PM/UI/Web/Components/DirectLoginsColumnManager.js", | 155 | "Clipperz/PM/UI/Web/Components/DirectLoginsColumnManager.js", |
156 | "Clipperz/PM/UI/Web/Components/DeleteObjectColumnManager.js", | 156 | "Clipperz/PM/UI/Web/Components/DeleteObjectColumnManager.js", |
157 | "Clipperz/PM/UI/Web/Components/CreateNewCardSplashComponent.js", | 157 | "Clipperz/PM/UI/Web/Components/CreateNewCardSplashComponent.js", |
158 | 158 | ||
159 | "Clipperz/PM/UI/Web/Components/AccountPanel.js", | 159 | "Clipperz/PM/UI/Web/Components/AccountPanel.js", |
160 | "Clipperz/PM/UI/Web/Components/DataPanel.js", | 160 | "Clipperz/PM/UI/Web/Components/DataPanel.js", |
161 | "Clipperz/PM/UI/Web/Components/ToolsPanel.js", | 161 | "Clipperz/PM/UI/Web/Components/ToolsPanel.js", |
162 | "Clipperz/PM/UI/Web/Components/RulerComponent.js", | 162 | "Clipperz/PM/UI/Web/Components/RulerComponent.js", |
163 | "Clipperz/PM/UI/Web/Components/CardDialogComponent.js", | 163 | "Clipperz/PM/UI/Web/Components/CardDialogComponent.js", |
164 | "Clipperz/PM/UI/Web/Components/CardDialogRecordFieldComponent.js", | 164 | "Clipperz/PM/UI/Web/Components/CardDialogRecordFieldComponent.js", |
165 | "Clipperz/PM/UI/Web/Components/CardDialogRecordDirectLoginComponent.js", | 165 | "Clipperz/PM/UI/Web/Components/CardDialogRecordDirectLoginComponent.js", |
166 | "Clipperz/PM/UI/Web/Components/DirectLoginEditingComponent.js", | 166 | "Clipperz/PM/UI/Web/Components/DirectLoginEditingComponent.js", |
167 | "Clipperz/PM/UI/Web/Components/DirectLoginEditingBindingComponent.js", | 167 | "Clipperz/PM/UI/Web/Components/DirectLoginEditingBindingComponent.js", |
168 | "Clipperz/PM/UI/Web/Components/DirectLoginEditingFormValueComponent.js", | 168 | "Clipperz/PM/UI/Web/Components/DirectLoginEditingFormValueComponent.js", |
169 | "Clipperz/PM/UI/Web/Components/BookmarkletComponent.js", | 169 | "Clipperz/PM/UI/Web/Components/BookmarkletComponent.js", |
170 | "Clipperz/PM/UI/Web/Components/UnlockPasswordComponent.js", | 170 | "Clipperz/PM/UI/Web/Components/UnlockPasswordComponent.js", |
171 | "Clipperz/PM/UI/Web/Components/NewUserCreationComponent.js", | 171 | "Clipperz/PM/UI/Web/Components/NewUserCreationComponent.js", |
172 | "Clipperz/PM/UI/Web/Components/PasswordTooltip.js", | 172 | "Clipperz/PM/UI/Web/Components/PasswordTooltip.js", |
173 | 173 | ||
174 | "Clipperz/PM/UI/Web/Controllers/MainController.js", | 174 | "Clipperz/PM/UI/Web/Controllers/MainController.js", |
175 | "Clipperz/PM/UI/Web/Controllers/LoginController.js", | 175 | "Clipperz/PM/UI/Web/Controllers/LoginController.js", |
176 | "Clipperz/PM/UI/Web/Controllers/AppController.js", | 176 | "Clipperz/PM/UI/Web/Controllers/AppController.js", |
177 | "Clipperz/PM/UI/Web/Controllers/FilterController.js", | 177 | "Clipperz/PM/UI/Web/Controllers/FilterController.js", |
178 | "Clipperz/PM/UI/Web/Controllers/GridController.js", | 178 | "Clipperz/PM/UI/Web/Controllers/GridController.js", |
179 | "Clipperz/PM/UI/Web/Controllers/CardsController.js", | 179 | "Clipperz/PM/UI/Web/Controllers/CardsController.js", |
180 | "Clipperz/PM/UI/Web/Controllers/DirectLoginsController.js", | 180 | "Clipperz/PM/UI/Web/Controllers/DirectLoginsController.js", |
181 | "Clipperz/PM/UI/Web/Controllers/CardDialogController.js", | 181 | "Clipperz/PM/UI/Web/Controllers/CardDialogController.js", |
182 | "Clipperz/PM/UI/Web/Controllers/DirectLoginWizardController.js", | 182 | "Clipperz/PM/UI/Web/Controllers/DirectLoginWizardController.js", |
183 | "Clipperz/PM/UI/Web/Controllers/NewUserWizardController.js", | 183 | "Clipperz/PM/UI/Web/Controllers/NewUserWizardController.js", |
184 | 184 | ||
185 | "main.js" | 185 | "main.js" |
186 | ], | 186 | ], |
187 | 187 | ||
188 | "css": [ | 188 | "css": [ |
189 | "web.css" | 189 | "web.css" |
190 | ] | 190 | ] |
191 | } \ No newline at end of file | 191 | } |