Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

version 0.7.80

  • Loading branch information...
commit aea8eb48c61a047deb389deb7fb42269150fb80d 1 parent b94b6eb
@zurmo authored
Showing with 1,165 additions and 202 deletions.
  1. +21 −17 .hg/branchheads.cache
  2. BIN  .hg/dirstate
  3. BIN  .hg/store/00changelog.d
  4. BIN  .hg/store/00changelog.i
  5. BIN  .hg/store/00manifest.d
  6. BIN  .hg/store/00manifest.i
  7. BIN  .hg/store/data/.hgtags.i
  8. BIN  .hg/store/data/app/index.php.i
  9. BIN  .hg/store/data/app/protected/config/common.php.i
  10. BIN  .hg/store/data/app/protected/core/components/_zurmo_ext_min_script.php.i
  11. BIN  .hg/store/data/app/protected/core/components/_zurmo_locale.php.i
  12. BIN  .hg/store/data/app/protected/core/elements/_model_element.php.i
  13. BIN  .hg/store/data/app/protected/core/elements/actions/_mass_delete_link_action_element.php.i
  14. BIN  .hg/store/data/app/protected/core/messages/de/_default.php.i
  15. BIN  .hg/store/data/app/protected/core/messages/es/_default.php.i
  16. BIN  .hg/store/data/app/protected/core/models/_red_bean_model.php.i
  17. BIN  .hg/store/data/app/protected/core/tests/unit/_red_bean_model_mulitple_same_model_relations_test.php.i
  18. BIN  .hg/store/data/app/protected/core/views/_edit_view.php.i
  19. BIN  .hg/store/data/app/protected/core/views/_list_view.php.i
  20. BIN  .hg/store/data/app/protected/core/views/_modal_list_view.php.i
  21. BIN  .hg/store/data/app/protected/core/views/_my_list_view.php.i
  22. BIN  .hg/store/data/app/protected/core/views/_page_view.php.i
  23. BIN  .hg/store/data/app/protected/core/views/_related_list_view.php.i
  24. BIN  .hg/store/data/app/protected/core/views/_sequential_process_view.php.i
  25. BIN  .hg/store/data/app/protected/core/widgets/_redactor.php.i
  26. BIN  .hg/store/data/app/protected/extensions/amcharts/_am_chart_maker.php.i
  27. BIN  .hg/store/data/app/protected/extensions/minscript/components/_ext_min_script.php.i
  28. BIN  .hg/store/data/app/protected/extensions/sentrylog/_r_sentry_log.php.i
  29. BIN  .hg/store/data/app/protected/extensions/sentrylog/lib/_raven/_autoloader.php.i
  30. BIN  .hg/store/data/app/protected/extensions/sentrylog/lib/_raven/_client.php.i
  31. BIN  .hg/store/data/app/protected/extensions/sentrylog/lib/_raven/_compat.php.i
  32. BIN  .hg/store/data/app/protected/extensions/sentrylog/lib/_raven/_error_handler.php.i
  33. BIN  .hg/store/data/app/protected/extensions/sentrylog/lib/_raven/_stacktrace.php.i
  34. BIN  .hg/store/data/app/protected/extensions/swiftmailer/lib/classes/_swift/_smtp_transport.php.i
  35. BIN  .hg/store/data/app/protected/modules/accounts/controllers/_default_controller.php.i
  36. BIN  .hg/store/data/app/protected/modules/activities/views/_latest_activities_list_view.php.i
  37. BIN  .hg/store/data/app/protected/modules/activities/views/related/_all_latest_activities_list_view.php.i
  38. BIN  .hg/store/data/app/protected/modules/activities/views/related/_contact_latest_activties_for_portlet_view.php.i
  39. BIN  .hg/store/data/app/protected/modules/contacts/controllers/_default_controller.php.i
  40. BIN  .hg/store/data/app/protected/modules/contacts/forms/_contact_primary_email_form.php.i
  41. BIN  .hg/store/data/app/protected/modules/contacts/views/related/_contacts_related_list_view.php.i
  42. BIN  ...protected/modules/email_messages/adapters/columns/_email_address_information_list_view_column_adapter.php.i
  43. BIN  .hg/store/data/app/protected/modules/email_messages/components/_email_helper.php.i
  44. BIN  .hg/store/data/app/protected/modules/email_messages/controllers/_default_controller.php.i
  45. BIN  ...app/protected/modules/email_messages/controllers/filters/_email_configuration_check_controller_filter.php.i
  46. BIN  ...rotected/modules/email_messages/controllers/filters/_user_email_configuration_check_controller_filter.php.i
  47. BIN  .hg/store/data/app/protected/modules/email_messages/elements/_email_address_information_element.php.i
  48. BIN  .hg/store/data/app/protected/modules/email_messages/elements/_email_signature_element.php.i
  49. BIN  ...data/app/protected/modules/email_messages/elements/derived/_email_message_all_recipient_types_element.php.i
  50. BIN  ...tore/data/app/protected/modules/email_messages/elements/derived/_email_message_bcc_recipients_element.php.i
  51. BIN  ...store/data/app/protected/modules/email_messages/elements/derived/_email_message_to_recipients_element.php.i
  52. BIN  .hg/store/data/app/protected/modules/email_messages/forms/_create_email_message_form.php.i
  53. BIN  .hg/store/data/app/protected/modules/email_messages/jobs/_email_archiving_job.php.i
  54. BIN  .hg/store/data/app/protected/modules/email_messages/jobs/_process_outbound_email_job.php.i
  55. BIN  .hg/store/data/app/protected/modules/email_messages/models/_email_account.php.i
  56. BIN  .hg/store/data/app/protected/modules/email_messages/models/_email_message.php.i
  57. BIN  .hg/store/data/app/protected/modules/email_messages/tests/unit/_create_email_message_form_test.php.i
  58. BIN  .hg/store/data/app/protected/modules/email_messages/tests/unit/_email_account_test.php.i
  59. BIN  .hg/store/data/app/protected/modules/email_messages/tests/unit/_email_helper_test.php.i
  60. BIN  .hg/store/data/app/protected/modules/email_messages/tests/unit/_email_message_helper_test.php.i
  61. BIN  .hg/store/data/app/protected/modules/email_messages/tests/unit/_email_message_test.php.i
  62. BIN  .hg/store/data/app/protected/modules/email_messages/tests/unit/_email_message_test_helper.php.i
  63. BIN  .hg/store/data/app/protected/modules/email_messages/tests/unit/_email_message_util_test.php.i
  64. BIN  .hg/store/data/app/protected/modules/email_messages/utils/_email_archiving_util.php.i
  65. BIN  .hg/store/data/app/protected/modules/email_messages/utils/_email_message_helper.php.i
  66. BIN  .hg/store/data/app/protected/modules/email_messages/utils/_email_message_util.php.i
  67. BIN  .hg/store/data/app/protected/modules/email_messages/views/_compose_email_edit_and_details_view.php.i
  68. BIN  .hg/store/data/app/protected/modules/email_messages/views/_compose_email_modal_edit_view.php.i
  69. BIN  ...tore/data/app/protected/modules/email_messages/views/_contact_requires_primary_email_first_modal_view.php.i
  70. BIN  .hg/store/data/app/protected/modules/email_messages/views/_create_email_message_modal_edit_view.php.i
  71. BIN  .hg/store/data/app/protected/modules/email_messages/views/_email_message_details_view.php.i
  72. BIN  .hg/store/data/app/protected/modules/email_messages/views/_no_email_account_yet_view.php.i
  73. BIN  .hg/store/data/app/protected/modules/email_messages/views/_no_global_email_configuration_yet_view.php.i
  74. BIN  .hg/store/data/app/protected/modules/email_messages/views/_no_user_email_configuration_yet_view.php.i
  75. BIN  .hg/store/data/app/protected/modules/install/utils/_install_util.php.i
  76. BIN  .hg/store/data/app/protected/modules/jobs_manager/views/_job_logs_modal_list_view.php.i
  77. BIN  .hg/store/data/app/protected/modules/leads/adapters/_leads_state_metadata_adapter.php.i
  78. BIN  .hg/store/data/app/protected/modules/leads/controllers/_default_controller.php.i
  79. BIN  .hg/store/data/app/protected/modules/meetings/views/_days_meetings_from_calendar_modal_list_view.php.i
  80. BIN  .hg/store/data/app/protected/modules/missions/views/_missions_portlet_list_view.php.i
  81. BIN  .hg/store/data/app/protected/modules/opportunities/controllers/_default_controller.php.i
  82. BIN  .hg/store/data/app/protected/modules/reports/adapters/_model_relations_and_attributes_to_report_adapter.php.i
  83. BIN  ...protected/modules/reports/adapters/_model_relations_and_attributes_to_rows_and_columns_report_adapter.php.i
  84. BIN  ...ta/app/protected/modules/reports/adapters/_model_relations_and_attributes_to_summation_report_adapter.php.i
  85. BIN  .hg/store/data/app/protected/modules/reports/components/_report_group_by.php.i
  86. BIN  .hg/store/data/app/protected/modules/reports/models/_report.php.i
  87. BIN  .hg/store/data/app/protected/modules/reports/rules/_report_rules.php.i
  88. BIN  .hg/store/data/app/protected/modules/reports/rules/_secured_report_rules.php.i
  89. BIN  ...re/data/app/protected/modules/reports/tests/unit/_model_relation_and_attribute_to_report_adapter_test.php.i
  90. BIN  .../data/app/protected/modules/reports/tests/unit/_model_relations_and_attributes_to_report_adapter_test.php.i
  91. BIN  .hg/store/data/app/protected/modules/reports/tests/unit/models/_report_model_test_item.php.i
  92. BIN  .hg/store/data/app/protected/modules/reports/tests/unit/models/_report_model_test_item2.php.i
  93. BIN  .hg/store/data/app/protected/modules/reports/tests/unit/models/_report_model_test_item3.php.i
  94. BIN  .hg/store/data/app/protected/modules/reports/tests/unit/models/_report_model_test_item4.php.i
  95. BIN  .hg/store/data/app/protected/modules/reports/tests/unit/models/_report_model_test_item5.php.i
  96. BIN  .hg/store/data/app/protected/modules/reports/tests/unit/models/_report_model_test_item6.php.i
  97. BIN  .hg/store/data/app/protected/modules/reports/tests/unit/models/_report_model_test_item7.php.i
  98. BIN  .hg/store/data/app/protected/modules/reports/tests/unit/rules/_report_test_rules.php.i
  99. BIN  .hg/store/data/app/protected/modules/tasks/messages/de/_default.php.i
  100. BIN  .hg/store/data/app/protected/modules/tasks/messages/es/_default.php.i
  101. BIN  .hg/store/data/app/protected/modules/tasks/messages/fr/_default.php.i
  102. BIN  .hg/store/data/app/protected/modules/tasks/messages/it/_default.php.i
  103. BIN  .hg/store/data/app/protected/modules/users/controllers/_default_controller.php.i
  104. BIN  .hg/store/data/app/protected/modules/users/elements/_outbound_settings_check_box_element.php.i
  105. BIN  .hg/store/data/app/protected/modules/users/elements/actions/_user_configuration_link_action_element.php.i
  106. BIN  .hg/store/data/app/protected/modules/users/forms/_user_email_configuration_form.php.i
  107. BIN  .hg/store/data/app/protected/modules/users/models/_user.php.i
  108. BIN  .hg/store/data/app/protected/modules/users/views/_user_action_bar_and_email_configuration_edit_view.php.i
  109. BIN  .hg/store/data/app/protected/modules/users/views/_user_email_configuration_edit_view.php.i
  110. BIN  .hg/store/data/app/protected/modules/users/views/_user_mail_configuration_edit_view.php.i
  111. BIN  .hg/store/data/app/protected/modules/zurmo/components/_end_request_behavior.php.i
  112. BIN  .hg/store/data/app/protected/modules/zurmo/components/_zurmo_base_controller.php.i
  113. BIN  .hg/store/data/app/protected/modules/zurmo/components/_zurmo_module_controller.php.i
  114. BIN  .hg/store/data/app/protected/modules/zurmo/elements/derived/_files_element.php.i
  115. BIN  .hg/store/data/app/protected/modules/zurmo/messages/de/_default.php.i
  116. BIN  .hg/store/data/app/protected/modules/zurmo/messages/es/_default.php.i
  117. BIN  .hg/store/data/app/protected/modules/zurmo/messages/fr/_default.php.i
  118. BIN  .hg/store/data/app/protected/modules/zurmo/messages/it/_default.php.i
  119. BIN  .hg/store/data/app/protected/modules/zurmo/tests/unit/_zurmo_base_test.php.i
  120. BIN  .hg/store/data/app/protected/modules/zurmo/views/_audit_events_modal_list_view.php.i
  121. BIN  .hg/store/data/app/themes/default/css/color-scheme-blue.css.i
  122. BIN  .hg/store/data/app/themes/default/css/color-scheme.css.i
  123. BIN  .hg/store/data/app/themes/default/css/newui.css.d
  124. BIN  .hg/store/data/app/themes/default/css/newui.css.i
  125. BIN  .hg/store/data/app/themes/default/less/color-scheme.css.i
  126. BIN  .hg/store/data/app/themes/default/less/color-scheme.less.i
  127. BIN  .hg/store/data/app/themes/default/less/configuration.less.i
  128. BIN  .hg/store/data/app/themes/default/less/dashboard-portlets.less.i
  129. BIN  .hg/store/data/app/themes/default/less/datepicker.less.i
  130. BIN  .hg/store/data/app/themes/default/less/designer.less.i
  131. BIN  .hg/store/data/app/themes/default/less/email.less.i
  132. BIN  .hg/store/data/app/themes/default/less/file-upload.less.i
  133. BIN  .hg/store/data/app/themes/default/less/form.less.i
  134. BIN  .hg/store/data/app/themes/default/less/gamification.less.i
  135. BIN  .hg/store/data/app/themes/default/less/install.less.i
  136. BIN  .hg/store/data/app/themes/default/less/mixins.less.i
  137. BIN  .hg/store/data/app/themes/default/less/newui.less.i
  138. BIN  .hg/store/data/app/themes/default/less/qtip.less.i
  139. BIN  .hg/store/data/app/themes/default/less/thread-view.less.i
  140. BIN  .hg/store/data/app/themes/default/less/token-input.less.i
  141. BIN  .hg/store/data/app/themes/default/less/welcome.less.i
  142. BIN  .hg/store/data/app/themes/default/less/widget-juiportlets.less.i
  143. BIN  .hg/store/data/app/themes/default/patterns/diagonal-noise/diagonal-noise.png.i
  144. BIN  .hg/store/data/app/themes/default/patterns/diagonal-noise/diagonal-noise__@2_x.png.i
  145. BIN  .hg/store/data/app/themes/default/patterns/diagonal-noise/readme.txt.i
  146. BIN  .hg/store/data/app/themes/default/patterns/exclusive__paper/exclusive__paper.png.d
  147. BIN  .hg/store/data/app/themes/default/patterns/exclusive__paper/exclusive__paper.png.i
  148. BIN  .hg/store/data/app/themes/default/patterns/exclusive__paper/exclusive__paper__@2_x.png.d
  149. BIN  .hg/store/data/app/themes/default/patterns/exclusive__paper/exclusive__paper__@2_x.png.i
  150. BIN  .hg/store/data/app/themes/default/patterns/exclusive__paper/readme.txt.i
  151. BIN  .hg/store/data/app/themes/default/patterns/frenchstucco/frenchstucco.png.i
  152. BIN  .hg/store/data/app/themes/default/patterns/frenchstucco/frenchstucco__@2_x.png.d
  153. BIN  .hg/store/data/app/themes/default/patterns/frenchstucco/frenchstucco__@2_x.png.i
  154. BIN  .hg/store/data/app/themes/default/patterns/frenchstucco/readme.txt.i
  155. BIN  .hg/store/data/app/themes/default/patterns/light__noise__diagonal/light__noise__diagonal.png.i
  156. BIN  .hg/store/data/app/themes/default/patterns/light__noise__diagonal/light__noise__diagonal__@2_x.png.i
  157. BIN  .hg/store/data/app/themes/default/patterns/light__noise__diagonal/readme.txt.i
  158. BIN  .hg/store/data/app/themes/default/patterns/light__toast/light__toast.png.i
  159. BIN  .hg/store/data/app/themes/default/patterns/light__toast/light__toast__@2_x.png.i
  160. BIN  .hg/store/data/app/themes/default/patterns/light__toast/readme.txt.i
  161. BIN  .hg/store/data/app/themes/default/patterns/paper/paper.png.i
  162. BIN  .hg/store/data/app/themes/default/patterns/paper/paper__@2_x.png.i
  163. BIN  .hg/store/data/app/themes/default/patterns/paper/readme.txt.i
  164. BIN  .hg/store/data/app/version.php.i
  165. BIN  .hg/store/data/index.php.i
  166. BIN  ...te/modules/conversa/elements/derived/onchangeprocessmultiplepeoplf7091d63b17a40ce214d22af4d33155d35e57cd2.i
  167. BIN  ...te/modules/emailmes/elements/actions/createemailmessagefromrelate104e55d5669925f128babf76bec2fbedf7a4a58b.i
  168. +65 −0 .hg/store/fncache
  169. BIN  .hg/store/undo
  170. +1 −1  .hg/undo.desc
  171. BIN  .hg/undo.dirstate
  172. +5 −0 .hgtags
  173. +2 −2 app/protected/config/common.php
  174. +1 −1  app/protected/core/components/ZurmoExtMinScript.php
  175. +3 −2 app/protected/core/components/ZurmoLocale.php
  176. +1 −1  app/protected/core/elements/actions/MassDeleteLinkActionElement.php
  177. +5 −5 app/protected/core/messages/de/Default.php
  178. +5 −5 app/protected/core/messages/es/Default.php
  179. +8 −2 app/protected/core/views/ListView.php
  180. +6 −1 app/protected/core/views/ModalListView.php
  181. +5 −0 app/protected/core/views/MyListView.php
  182. +5 −0 app/protected/core/views/RelatedListView.php
  183. +3 −3 app/protected/core/views/SequentialProcessView.php
  184. +43 −0 app/protected/core/widgets/AmChart.php
  185. +386 −0 app/protected/core/widgets/assets/amChart/amcharts.js
  186. +294 −0 app/protected/extensions/amcharts/AmChartMaker.php
  187. +2 −0  app/protected/extensions/minscript/components/ExtMinScript.php
  188. +13 −5 app/protected/modules/accounts/controllers/DefaultController.php
  189. +5 −0 app/protected/modules/activities/views/LatestActivitiesListView.php
  190. +5 −0 app/protected/modules/activities/views/related/AllLatestActivitiesListView.php
  191. +21 −20 app/protected/modules/contacts/controllers/DefaultController.php
  192. +1 −20 app/protected/modules/conversations/elements/derived/OnChangeProcessMultiplePeopleForConversationElement.php
  193. +37 −30 app/protected/modules/emailMessages/jobs/EmailArchivingJob.php
  194. +1 −0  app/protected/modules/install/utils/InstallUtil.php
  195. +5 −0 app/protected/modules/jobsManager/views/JobLogsModalListView.php
  196. +18 −17 app/protected/modules/leads/controllers/DefaultController.php
  197. +5 −0 app/protected/modules/meetings/views/DaysMeetingsFromCalendarModalListView.php
  198. +5 −0 app/protected/modules/missions/views/MissionsPortletListView.php
  199. +13 −5 app/protected/modules/opportunities/controllers/DefaultController.php
  200. +1 −1  app/protected/modules/opportunities/dataproviders/OpportunitiesBySourceChartDataProvider.php
  201. +1 −2  app/protected/modules/opportunities/tests/unit/walkthrough/OpportunitiesChartWalkthroughTest.php
  202. +18 −6 app/protected/modules/opportunities/views/charts/OpportunitiesBySourceChartView.php
  203. +17 −5 app/protected/modules/opportunities/views/charts/OpportunitiesByStageChartView.php
  204. +0 −2  app/protected/modules/tasks/messages/de/Default.php
  205. +0 −2  app/protected/modules/tasks/messages/es/Default.php
  206. +0 −2  app/protected/modules/tasks/messages/fr/Default.php
  207. +0 −2  app/protected/modules/tasks/messages/it/Default.php
  208. +11 −8 app/protected/modules/users/controllers/DefaultController.php
  209. +1 −1  app/protected/modules/zurmo/components/EndRequestBehavior.php
  210. +13 −2 app/protected/modules/zurmo/components/ZurmoBaseController.php
  211. +5 −2 app/protected/modules/zurmo/components/ZurmoModuleController.php
  212. +5 −3 app/protected/modules/zurmo/messages/de/Default.php
  213. +6 −4 app/protected/modules/zurmo/messages/es/Default.php
  214. +3 −1 app/protected/modules/zurmo/messages/fr/Default.php
  215. +3 −1 app/protected/modules/zurmo/messages/it/Default.php
  216. +0 −1  app/protected/modules/zurmo/tests/unit/ZurmoBaseTest.php
  217. +5 −0 app/protected/modules/zurmo/views/AuditEventsModalListView.php
  218. +42 −10 app/themes/default/css/newui.css
  219. +1 −1  app/themes/default/less/configuration.less
  220. +9 −6 app/themes/default/less/form.less
  221. +31 −1 app/themes/default/less/newui.less
  222. +1 −0  app/themes/default/less/thread-view.less
  223. +1 −1  app/version.php
  224. +1 −1  index.php
View
38 .hg/branchheads.cache
@@ -1,5 +1,6 @@
-2d8566c0b4ee6aaec71e6fee0df5820231ac6b45 4356
+f453eebc034cd6530c75255b9759f524c5dcf272 4453
dc87114b543cef2e514caaf53158a0cec6c16ba7 apiMergeWithDefault
+f453eebc034cd6530c75255b9759f524c5dcf272 default
528aeb46da83bbc059a81856f22080d3afcbafcc 0.6.9-development
b54558ec1152000af342afa1a8e8d71e410fd308 newuserinterface
cbe3d8bd7bb9330cdce8032993dc2126676b4d05 additionalApiFeatures
@@ -7,55 +8,58 @@ cbe3d8bd7bb9330cdce8032993dc2126676b4d05 additionalApiFeatures
bc62c22cb4762add223203af0973ade04dd08182 webApi2
b5bf0195a342f5fb90a2503d4e5eba6c71360769 Iteration18
290f7e88f2f3db6c5d242cfcfabe1eae7bd15827 securityUI
+26615b2519a4a9da4dfeeaa60ee1e71bb5019bf5 animations
5843a8e3bfe990d11c91dc4c239ca81912233d30 stableRev
cbd2ce866432bfab51a36dcb183ffd839c6dcf55 0.7.2-development
a837f842ea961f5ea6cc2481dc63a8763c3c4e87 export
-c3567ae696ed28fb036594476cf9b53293a30916 import
233f19fe5348ffee6697402b1a0f0f3b5da5e341 convoandmissions
33d15992195a243b446fafcf706979eac97dfa9e functionalTests
7ea98584caac52a5aefcc781a6ea552d11aeaa33 listviewcolumnselection
134cda65e593500869641853e41156b2a78207b6 redbean3.0
8a16935be6f25f173e73b2c1184545fee8c53a48 userinterface2
-02f5d279c5b86e92ff4d61ca5f8b3cda38d48ed5 webApi
-c4ee6de616e411766466d0cb95dd5c49ad4a6743 composeAndSendEmail
-090661edd1811c5288282e568d4bf1646a2dc87b globalsearch
+b42b9711a2aa1bbd30fd0e6c9a3c4adbe2b24474 Themes
+ed170230616d5f4e8235dd41608fb6fb3d52cba5 composeAndSendEmail
+ecda5e1f81da39dd75227a4eaa99eea1c4e05d76 candidate
+6016a237a40cae0d6512d51bd55009a824e22111 0.7.60
85c9fa1642c1fe95bd667eeebc05f5e245eccf8e performance2
e9d5ddaea0c3793d04774624508acd6089564cee profileavatar
b25f15479facb1dcf58db9258c50bc93d0e8800a gamification
a3f8a7d24ffc53ac9b910cb84406640cfa73edb4 globalsearchlist
-8b50dabb972410a5a02f9ed40b7b47ddc899bd9f performance
+f4205aa2a8c5a5087af5ce73021e1d07d00dc123 stable
+c3567ae696ed28fb036594476cf9b53293a30916 import
23f0d4d012bbfb8973027966a75406ae1b294beb 0.7.4-development
+38c513f9a844e7723805754d66ca48f991688eb2 submitbugs
f568a1cf9d4bd30dc8dc7803402778d784387458 geocoding
171ecad82f5a9c8fe6eb0bf10744051d51f9b63b optimizeFileImport
501772a62fababe91d24c5d41669e47148e50f64 installUtilTest
e00b60b3998fa9737720812eccb1f4b9cf86fdfb ui0.8
6556e38f9602b2d42c8638011514690bee0df908 emailMessages
2405e7b18ed4d4108bec7dc3d2240b244ec2b15a searchrefactor
-130854662b9687a821c60f0f89e54cc9a00c58cb additionalInstallationCheck
+fb9dce13d2066c7ce8e11fea944888f7002728d6 databasePort
a9873703458bc7462635905ff9ec6e6c0566eaaf smallTasks
c04bd1587fe3608f39cf299166387445fa9f1bad classbeanrefactor
+f075150ad2a79f2ded8bc1702e75d027dc312746 Spanish
bb0adb9e0c5759a69c6183c22d3050df3f17902c mapping
67cce71b741908c74f9b84b894c5080b36213abd french
a5626156edc87b42054d306069e4235777ff0336 zurmoUpgrade
7fe54627667777b0d93d4d87e0837d23c77fc210 additionalWalkthroughTests
-1437f2424ae296777bde535c5fcc1ef4c3f701a4 minify
+766201d93cfb1c197cf4c556f5cb89f054e5a9f7 release
3d2d78c7e16a931c789c571c978049352a82a0d8 jobsAndNotifications
-26615b2519a4a9da4dfeeaa60ee1e71bb5019bf5 animations
+8b50dabb972410a5a02f9ed40b7b47ddc899bd9f performance
24890a9d5293d9c2b7165d151c66851dd098a9cb newAttributeTypes
8a73e24b0205f7f985c8bb360074068259f22002 unitTests
-a0c0a6986f1e133fd831ea141ab943fb95c878a3 emailNotificationsRefactor
-85cca37f791e2932b97e1aae3df0e9406c57cd00 default
+02f5d279c5b86e92ff4d61ca5f8b3cda38d48ed5 webApi
+1437f2424ae296777bde535c5fcc1ef4c3f701a4 minify
4c99b60f2effb4ea6b8e51d7bd66433254e14e41 SavedSearch
2e440b45637a04c6ef9ca74d2f1d018a03eec244 multibyte-label
f00a70da7758e5cb37a7e1aeba48d1b1bae2f45d unittestargv
-2d8566c0b4ee6aaec71e6fee0df5820231ac6b45 reports
+33a8c96f134906e6339b0921541614dd35c17b6c reports
6f24c0b152dcd3bc9b03ed5814d5c2d368e948af developmenttools
-6016a237a40cae0d6512d51bd55009a824e22111 0.7.60
-e0f898a0ec99b8592b8d37e2361ffb1c1ef764a7 amCharts
-fb9dce13d2066c7ce8e11fea944888f7002728d6 databasePort
-f075150ad2a79f2ded8bc1702e75d027dc312746 Spanish
+090661edd1811c5288282e568d4bf1646a2dc87b globalsearch
+bc88b2a0f7a3d01a568a186d9a0dbb47b08d814a amCharts
+130854662b9687a821c60f0f89e54cc9a00c58cb additionalInstallationCheck
+a0c0a6986f1e133fd831ea141ab943fb95c878a3 emailNotificationsRefactor
fe65a71608dde103bed28c9fc5413a834aaf433a OptimizeDemoDataInstallation
59f5787db30191cb4d866d997c60f1a388003b65 installationTest
-261c2d4946a11fb993eeab3b75cbe50f31de8045 Themes
d442b631e0320eb0bcefe6c1d7808146e2832b84 socialitems
5f0c06ebc1bfb2b783f0e45bebd479941e304cdf 0.7.0-development
View
BIN  .hg/dirstate
Binary file not shown
View
BIN  .hg/store/00changelog.d
Binary file not shown
View
BIN  .hg/store/00changelog.i
Binary file not shown
View
BIN  .hg/store/00manifest.d
Binary file not shown
View
BIN  .hg/store/00manifest.i
Binary file not shown
View
BIN  .hg/store/data/.hgtags.i
Binary file not shown
View
BIN  .hg/store/data/app/index.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/config/common.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/core/components/_zurmo_ext_min_script.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/core/components/_zurmo_locale.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/core/elements/_model_element.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/core/elements/actions/_mass_delete_link_action_element.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/core/messages/de/_default.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/core/messages/es/_default.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/core/models/_red_bean_model.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/core/tests/unit/_red_bean_model_mulitple_same_model_relations_test.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/core/views/_edit_view.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/core/views/_list_view.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/core/views/_modal_list_view.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/core/views/_my_list_view.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/core/views/_page_view.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/core/views/_related_list_view.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/core/views/_sequential_process_view.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/core/widgets/_redactor.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/extensions/amcharts/_am_chart_maker.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/extensions/minscript/components/_ext_min_script.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/extensions/sentrylog/_r_sentry_log.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/extensions/sentrylog/lib/_raven/_autoloader.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/extensions/sentrylog/lib/_raven/_client.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/extensions/sentrylog/lib/_raven/_compat.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/extensions/sentrylog/lib/_raven/_error_handler.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/extensions/sentrylog/lib/_raven/_stacktrace.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/extensions/swiftmailer/lib/classes/_swift/_smtp_transport.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/accounts/controllers/_default_controller.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/activities/views/_latest_activities_list_view.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/activities/views/related/_all_latest_activities_list_view.php.i
Binary file not shown
View
BIN  ...ore/data/app/protected/modules/activities/views/related/_contact_latest_activties_for_portlet_view.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/contacts/controllers/_default_controller.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/contacts/forms/_contact_primary_email_form.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/contacts/views/related/_contacts_related_list_view.php.i
Binary file not shown
View
BIN  ...tected/modules/email_messages/adapters/columns/_email_address_information_list_view_column_adapter.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/email_messages/components/_email_helper.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/email_messages/controllers/_default_controller.php.i
Binary file not shown
View
BIN  .../protected/modules/email_messages/controllers/filters/_email_configuration_check_controller_filter.php.i
Binary file not shown
View
BIN  ...ected/modules/email_messages/controllers/filters/_user_email_configuration_check_controller_filter.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/email_messages/elements/_email_address_information_element.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/email_messages/elements/_email_signature_element.php.i
Binary file not shown
View
BIN  ...a/app/protected/modules/email_messages/elements/derived/_email_message_all_recipient_types_element.php.i
Binary file not shown
View
BIN  ...e/data/app/protected/modules/email_messages/elements/derived/_email_message_bcc_recipients_element.php.i
Binary file not shown
View
BIN  ...re/data/app/protected/modules/email_messages/elements/derived/_email_message_to_recipients_element.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/email_messages/forms/_create_email_message_form.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/email_messages/jobs/_email_archiving_job.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/email_messages/jobs/_process_outbound_email_job.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/email_messages/models/_email_account.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/email_messages/models/_email_message.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/email_messages/tests/unit/_create_email_message_form_test.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/email_messages/tests/unit/_email_account_test.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/email_messages/tests/unit/_email_helper_test.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/email_messages/tests/unit/_email_message_helper_test.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/email_messages/tests/unit/_email_message_test.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/email_messages/tests/unit/_email_message_test_helper.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/email_messages/tests/unit/_email_message_util_test.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/email_messages/utils/_email_archiving_util.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/email_messages/utils/_email_message_helper.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/email_messages/utils/_email_message_util.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/email_messages/views/_compose_email_edit_and_details_view.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/email_messages/views/_compose_email_modal_edit_view.php.i
Binary file not shown
View
BIN  ...e/data/app/protected/modules/email_messages/views/_contact_requires_primary_email_first_modal_view.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/email_messages/views/_create_email_message_modal_edit_view.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/email_messages/views/_email_message_details_view.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/email_messages/views/_no_email_account_yet_view.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/email_messages/views/_no_global_email_configuration_yet_view.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/email_messages/views/_no_user_email_configuration_yet_view.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/install/utils/_install_util.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/jobs_manager/views/_job_logs_modal_list_view.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/leads/adapters/_leads_state_metadata_adapter.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/leads/controllers/_default_controller.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/meetings/views/_days_meetings_from_calendar_modal_list_view.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/missions/views/_missions_portlet_list_view.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/opportunities/controllers/_default_controller.php.i
Binary file not shown
View
BIN  ...tore/data/app/protected/modules/reports/adapters/_model_relations_and_attributes_to_report_adapter.php.i
Binary file not shown
View
BIN  ...tected/modules/reports/adapters/_model_relations_and_attributes_to_rows_and_columns_report_adapter.php.i
Binary file not shown
View
BIN  ...app/protected/modules/reports/adapters/_model_relations_and_attributes_to_summation_report_adapter.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/reports/components/_report_group_by.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/reports/models/_report.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/reports/rules/_report_rules.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/reports/rules/_secured_report_rules.php.i
Binary file not shown
View
BIN  ...data/app/protected/modules/reports/tests/unit/_model_relation_and_attribute_to_report_adapter_test.php.i
Binary file not shown
View
BIN  ...ta/app/protected/modules/reports/tests/unit/_model_relations_and_attributes_to_report_adapter_test.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/reports/tests/unit/models/_report_model_test_item.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/reports/tests/unit/models/_report_model_test_item2.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/reports/tests/unit/models/_report_model_test_item3.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/reports/tests/unit/models/_report_model_test_item4.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/reports/tests/unit/models/_report_model_test_item5.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/reports/tests/unit/models/_report_model_test_item6.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/reports/tests/unit/models/_report_model_test_item7.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/reports/tests/unit/rules/_report_test_rules.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/tasks/messages/de/_default.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/tasks/messages/es/_default.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/tasks/messages/fr/_default.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/tasks/messages/it/_default.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/users/controllers/_default_controller.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/users/elements/_outbound_settings_check_box_element.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/users/elements/actions/_user_configuration_link_action_element.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/users/forms/_user_email_configuration_form.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/users/models/_user.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/users/views/_user_action_bar_and_email_configuration_edit_view.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/users/views/_user_email_configuration_edit_view.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/users/views/_user_mail_configuration_edit_view.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/zurmo/components/_end_request_behavior.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/zurmo/components/_zurmo_base_controller.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/zurmo/components/_zurmo_module_controller.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/zurmo/elements/derived/_files_element.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/zurmo/messages/de/_default.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/zurmo/messages/es/_default.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/zurmo/messages/fr/_default.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/zurmo/messages/it/_default.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/zurmo/tests/unit/_zurmo_base_test.php.i
Binary file not shown
View
BIN  .hg/store/data/app/protected/modules/zurmo/views/_audit_events_modal_list_view.php.i
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/css/color-scheme-blue.css.i
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/css/color-scheme.css.i
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/css/newui.css.d
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/css/newui.css.i
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/less/color-scheme.css.i
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/less/color-scheme.less.i
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/less/configuration.less.i
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/less/dashboard-portlets.less.i
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/less/datepicker.less.i
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/less/designer.less.i
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/less/email.less.i
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/less/file-upload.less.i
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/less/form.less.i
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/less/gamification.less.i
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/less/install.less.i
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/less/mixins.less.i
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/less/newui.less.i
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/less/qtip.less.i
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/less/thread-view.less.i
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/less/token-input.less.i
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/less/welcome.less.i
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/less/widget-juiportlets.less.i
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/patterns/diagonal-noise/diagonal-noise.png.i
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/patterns/diagonal-noise/diagonal-noise__@2_x.png.i
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/patterns/diagonal-noise/readme.txt.i
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/patterns/exclusive__paper/exclusive__paper.png.d
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/patterns/exclusive__paper/exclusive__paper.png.i
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/patterns/exclusive__paper/exclusive__paper__@2_x.png.d
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/patterns/exclusive__paper/exclusive__paper__@2_x.png.i
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/patterns/exclusive__paper/readme.txt.i
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/patterns/frenchstucco/frenchstucco.png.i
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/patterns/frenchstucco/frenchstucco__@2_x.png.d
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/patterns/frenchstucco/frenchstucco__@2_x.png.i
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/patterns/frenchstucco/readme.txt.i
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/patterns/light__noise__diagonal/light__noise__diagonal.png.i
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/patterns/light__noise__diagonal/light__noise__diagonal__@2_x.png.i
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/patterns/light__noise__diagonal/readme.txt.i
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/patterns/light__toast/light__toast.png.i
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/patterns/light__toast/light__toast__@2_x.png.i
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/patterns/light__toast/readme.txt.i
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/patterns/paper/paper.png.i
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/patterns/paper/paper__@2_x.png.i
Binary file not shown
View
BIN  .hg/store/data/app/themes/default/patterns/paper/readme.txt.i
Binary file not shown
View
BIN  .hg/store/data/app/version.php.i
Binary file not shown
View
BIN  .hg/store/data/index.php.i
Binary file not shown
View
BIN  ...modules/conversa/elements/derived/onchangeprocessmultiplepeoplf7091d63b17a40ce214d22af4d33155d35e57cd2.i
Binary file not shown
View
BIN  ...modules/emailmes/elements/actions/createemailmessagefromrelate104e55d5669925f128babf76bec2fbedf7a4a58b.i
Binary file not shown
View
65 .hg/store/fncache
@@ -6269,3 +6269,68 @@ data/app/protected/modules/zurmo/utils/MassDeleteInsufficientPermissionSkipSavin
data/app/themes/default/css/color-scheme.css.i
data/app/themes/default/less/color-scheme.css.i
data/app/themes/default/less/color-scheme.less.i
+data/app/protected/extensions/sentrylog/RSentryLog.php.i
+data/app/protected/extensions/sentrylog/lib/Raven/Autoloader.php.i
+data/app/protected/extensions/sentrylog/lib/Raven/Client.php.i
+data/app/protected/extensions/sentrylog/lib/Raven/Compat.php.i
+data/app/protected/extensions/sentrylog/lib/Raven/ErrorHandler.php.i
+data/app/protected/extensions/sentrylog/lib/Raven/Stacktrace.php.i
+data/app/protected/modules/contacts/forms/ContactPrimaryEmailForm.php.i
+data/app/protected/modules/emailMessages/adapters/columns/EmailAddressInformationListViewColumnAdapter.php.i
+data/app/protected/modules/emailMessages/controllers/filters/EmailConfigurationCheckControllerFilter.php.i
+data/app/protected/modules/emailMessages/controllers/filters/UserEmailConfigurationCheckControllerFilter.php.i
+data/app/protected/modules/emailMessages/elements/EmailAddressInformationElement.php.i
+data/app/protected/modules/emailMessages/elements/EmailSignatureElement.php.i
+data/app/protected/modules/emailMessages/elements/actions/CreateEmailMessageFromRelatedListLinkActionElement.php.i
+data/app/protected/modules/emailMessages/elements/derived/EmailMessageAllRecipientTypesElement.php.i
+data/app/protected/modules/emailMessages/elements/derived/EmailMessageBccRecipientsElement.php.i
+data/app/protected/modules/emailMessages/forms/CreateEmailMessageForm.php.i
+data/app/protected/modules/emailMessages/tests/unit/CreateEmailMessageFormTest.php.i
+data/app/protected/modules/emailMessages/tests/unit/EmailMessageUtilTest.php.i
+data/app/protected/modules/emailMessages/utils/EmailMessageUtil.php.i
+data/app/protected/modules/emailMessages/views/ComposeEmailModalEditView.php.i
+data/app/protected/modules/emailMessages/views/ContactRequiresPrimaryEmailFirstModalView.php.i
+data/app/protected/modules/emailMessages/views/CreateEmailMessageModalEditView.php.i
+data/app/protected/modules/emailMessages/views/NoGlobalEmailConfigurationYetView.php.i
+data/app/protected/modules/emailMessages/views/NoUserEmailConfigurationYetView.php.i
+data/app/protected/modules/reports/adapters/ModelRelationsAndAttributesToReportAdapter.php.i
+data/app/protected/modules/reports/adapters/ModelRelationsAndAttributesToRowsAndColumnsReportAdapter.php.i
+data/app/protected/modules/reports/adapters/ModelRelationsAndAttributesToSummationReportAdapter.php.i
+data/app/protected/modules/reports/components/ReportGroupBy.php.i
+data/app/protected/modules/reports/rules/ReportRules.php.i
+data/app/protected/modules/reports/rules/SecuredReportRules.php.i
+data/app/protected/modules/reports/tests/unit/ModelRelationAndAttributeToReportAdapterTest.php.i
+data/app/protected/modules/reports/tests/unit/ModelRelationsAndAttributesToReportAdapterTest.php.i
+data/app/protected/modules/reports/tests/unit/models/ReportModelTestItem.php.i
+data/app/protected/modules/reports/tests/unit/models/ReportModelTestItem2.php.i
+data/app/protected/modules/reports/tests/unit/models/ReportModelTestItem3.php.i
+data/app/protected/modules/reports/tests/unit/models/ReportModelTestItem4.php.i
+data/app/protected/modules/reports/tests/unit/models/ReportModelTestItem5.php.i
+data/app/protected/modules/reports/tests/unit/models/ReportModelTestItem6.php.i
+data/app/protected/modules/reports/tests/unit/models/ReportModelTestItem7.php.i
+data/app/protected/modules/reports/tests/unit/rules/ReportTestRules.php.i
+data/app/protected/modules/users/forms/UserEmailConfigurationForm.php.i
+data/app/protected/modules/users/views/UserActionBarAndEmailConfigurationEditView.php.i
+data/app/protected/modules/users/views/UserEmailConfigurationEditView.php.i
+data/app/themes/default/css/color-scheme-blue.css.i
+data/app/themes/default/patterns/diagonal-noise/diagonal-noise.png.i
+data/app/themes/default/patterns/diagonal-noise/diagonal-noise_@2X.png.i
+data/app/themes/default/patterns/diagonal-noise/readme.txt.i
+data/app/themes/default/patterns/exclusive_paper/exclusive_paper.png.i
+data/app/themes/default/patterns/exclusive_paper/exclusive_paper.png.d
+data/app/themes/default/patterns/exclusive_paper/exclusive_paper_@2X.png.i
+data/app/themes/default/patterns/exclusive_paper/exclusive_paper_@2X.png.d
+data/app/themes/default/patterns/exclusive_paper/readme.txt.i
+data/app/themes/default/patterns/frenchstucco/frenchstucco.png.i
+data/app/themes/default/patterns/frenchstucco/frenchstucco_@2X.png.i
+data/app/themes/default/patterns/frenchstucco/frenchstucco_@2X.png.d
+data/app/themes/default/patterns/frenchstucco/readme.txt.i
+data/app/themes/default/patterns/light_noise_diagonal/light_noise_diagonal.png.i
+data/app/themes/default/patterns/light_noise_diagonal/light_noise_diagonal_@2X.png.i
+data/app/themes/default/patterns/light_noise_diagonal/readme.txt.i
+data/app/themes/default/patterns/light_toast/light_toast.png.i
+data/app/themes/default/patterns/light_toast/light_toast_@2X.png.i
+data/app/themes/default/patterns/light_toast/readme.txt.i
+data/app/themes/default/patterns/paper/paper.png.i
+data/app/themes/default/patterns/paper/paper_@2X.png.i
+data/app/themes/default/patterns/paper/readme.txt.i
View
BIN  .hg/store/undo
Binary file not shown
View
2  .hg/undo.desc
@@ -1,3 +1,3 @@
-4078
+4357
pull
https://bitbucket.org/zurmo/zurmo
View
BIN  .hg/undo.dirstate
Binary file not shown
View
5 .hgtags
@@ -185,3 +185,8 @@ b36de491b85380bb48e73d6df2145859a924a18d unstable
476671e5a5c75970b5720acc928159a75fbad7e1 unstable
10ecb5216d06e94adbd978ea2db5cec98f3ba8ee unstable
10ecb5216d06e94adbd978ea2db5cec98f3ba8ee 0.7.70
+10ecb5216d06e94adbd978ea2db5cec98f3ba8ee unstable
+17596b51d97d227e5e2f9a18946144921cd9a01c unstable
+10ecb5216d06e94adbd978ea2db5cec98f3ba8ee stable
+03f2734b34d3a91caeeefb751b372032414e29a3 stable
+03f2734b34d3a91caeeefb751b372032414e29a3 0.7.80
View
4 app/protected/config/common.php
@@ -94,7 +94,6 @@
'groupMap' => array(
'css' => array(
INSTANCE_ROOT . DIRECTORY_SEPARATOR . 'themes/THEME_NAME/css/newui.css',
- INSTANCE_ROOT . DIRECTORY_SEPARATOR . 'themes/THEME_NAME/css/jquery-multiselect.css',
INSTANCE_ROOT . DIRECTORY_SEPARATOR . 'protected/extensions/timepicker/assets/jquery-ui-timepicker-addon.css'
),
@@ -329,7 +328,8 @@
),
'preload' => array(
'browser',
- 'sanitizer'
+ 'sanitizer',
+ 'log'
),
);
return $common_config;
View
2  app/protected/core/components/ZurmoExtMinScript.php
@@ -45,7 +45,7 @@ class ZurmoExtMinScript extends ExtMinScript
public function init()
{
CApplicationComponent::init();
- $minifyDir = dirname(dirname(__FILE__)) . '/vendors/minify/min';
+ $minifyDir = dirname(dirname(dirname(__FILE__))) . '/extensions/minscript/vendors/minify/min';
$this -> _minifyDir = $minifyDir;
if (!extension_loaded('apc'))
{
View
5 app/protected/core/components/ZurmoLocale.php
@@ -26,7 +26,8 @@
/**
* Improved Locale class to overcome some issues in Yii's CLocale.
- * Needed to override the almost the entire class as the CLocale's constructor and variables are protected.
+ * Needed to override almost the entire class as the CLocale's constructor and variables are protected.
+ * Any of the parent functions that uses the private attributes are overriden.
*/
class ZurmoLocale extends CLocale
{
@@ -311,7 +312,7 @@ public function getTimeFormat($width = 'medium')
*/
public function getDateTimeFormat()
{
- if (in_array($this->_id, array('ja', 'zn_ch')))
+ if (in_array($this->_id, array('zn_ch')))
{
return '{1} {0}';
}
View
2  app/protected/core/elements/actions/MassDeleteLinkActionElement.php
@@ -104,7 +104,7 @@ public function render()
'itemOptions' => array( 'id' => $allName))));
$cClipWidget = new CClipWidget();
$cClipWidget->beginClip("ActionMenu");
- $cClipWidget->widget('ext.zurmoinc.framework.widgets.MbMenu', array(
+ $cClipWidget->widget('application.core.widgets.MbMenu', array(
'htmlOptions' => array('id' => 'ListViewDeleteMassActionMenu'),
'items' => array($menuItems),
));
View
10 app/protected/core/messages/de/Default.php
@@ -130,7 +130,7 @@
'Delete'
=> 'Löschen',
'Deleting'
- => '??',
+ => 'Löschen im Gange',
'Detail View Only'
=> 'Nur Detailansicht',
'Details'
@@ -200,9 +200,9 @@
'Loading UpgraderComponent.'
=> 'UpgraderComponent Lädt.',
'Mass Delete'
- => '??',
+ => 'Massen Delete',
'Mass Delete is not reversable.'
- => '??',
+ => 'Massen Löschen ist nicht umkehrbar.',
'Mass Update'
=> 'Massenaktualisierung',
'Max upload size: {maxSize}'
@@ -320,7 +320,7 @@
'Selected'
=> 'Ausgewählt',
'selected for removal.'
- => '??',
+ => 'ausgewählt zur Entfernung.',
'selected for updating.'
=> 'Ausgewählt zur Aktualisierung',
'Serialized Data'
@@ -334,7 +334,7 @@
'Start typing to search'
=> 'Geben Sie hier Ihren Suchbegriff ein',
'successfully deleted'
- => '??',
+ => 'erfolgreich gelöscht',
'Tab'
=> 'Tab', // Same Word Translated
'The file did not exist'
View
10 app/protected/core/messages/es/Default.php
@@ -130,7 +130,7 @@
'Delete'
=> 'Eliminar',
'Deleting'
- => '??',
+ => 'Eliminación en progreso',
'Detail View Only'
=> 'Solo vista de detalles',
'Details'
@@ -200,9 +200,9 @@
'Loading UpgraderComponent.'
=> 'Cargando UpgraderComponent.',
'Mass Delete'
- => '??',
+ => 'Borrar en masa',
'Mass Delete is not reversable.'
- => '??',
+ => 'Borradar en masa no es reversible.',
'Mass Update'
=> 'Actualización Global',
'Max upload size: {maxSize}'
@@ -320,7 +320,7 @@
'Selected'
=> 'Seleccionado',
'selected for removal.'
- => '??',
+ => 'seleccionado para eliminación.',
'selected for updating.'
=> 'seleccionado por actualización',
'Serialized Data'
@@ -334,7 +334,7 @@
'Start typing to search'
=> 'Escriba su búsqueda aquí',
'successfully deleted'
- => '??',
+ => 'eliminado con éxito',
'Tab'
=> 'Tab', // Same Word Translated
'The file did not exist'
View
10 app/protected/core/views/ListView.php
@@ -156,11 +156,12 @@ protected function getCGridViewParams()
'afterAjaxUpdate' => $this->getCGridViewAfterAjaxUpdate(),
'columns' => $columns,
'nullDisplay' => ' ',
+ 'pagerCssClass' => static::getPagerCssClass(),
'showTableOnEmpty' => $this->getShowTableOnEmpty(),
'emptyText' => $this->getEmptyText(),
'template' => static::getGridTemplate(),
- 'summaryText' => $this->getSummaryText(),
- 'summaryCssClass' => $this->getSummaryCssClass(),
+ 'summaryText' => static::getSummaryText(),
+ 'summaryCssClass' => static::getSummaryCssClass(),
);
}
@@ -170,6 +171,11 @@ protected static function getGridTemplate()
return "{summary}\n{items}\n{pager}" . $preloader;
}
+ protected static function getPagerCssClass()
+ {
+ return 'pager vertical';
+ }
+
protected static function getSummaryText()
{
return Yii::t('Default', '{count} result(s)');
View
7 app/protected/core/views/ModalListView.php
@@ -51,6 +51,11 @@ protected function getCGridViewLastColumn()
return array();
}
+ protected static function getPagerCssClass()
+ {
+ return 'pager horizontal';
+ }
+
protected static function getSummaryText()
{
return Yii::t('Default', '{start}-{end} of {count} result(s).');
@@ -79,7 +84,7 @@ protected function getCGridViewAfterAjaxUpdate()
// Begin Not Coding Standard
return 'js:function(id, data) {
processAjaxSuccessError(id, data);
- processListViewSummaryClone("' . $this->getGridViewId() . '", "' . $this->getSummaryCssClass() . '");
+ processListViewSummaryClone("' . $this->getGridViewId() . '", "' . static::getSummaryCssClass() . '");
}';
// End Not Coding Standard
}
View
5 app/protected/core/views/MyListView.php
@@ -144,6 +144,11 @@ public function getConfigurationView()
return new $configViewClassName($formModel, $searchForm, $this->params);
}
+ protected static function getPagerCssClass()
+ {
+ return 'pager horizontal';
+ }
+
protected function getCGridViewPagerParams()
{
return array(
View
5 app/protected/core/views/RelatedListView.php
@@ -136,6 +136,11 @@ protected function getCreateLinkRouteParameters()
);
}
+ protected static function getPagerCssClass()
+ {
+ return 'pager horizontal';
+ }
+
protected function getCGridViewPagerParams()
{
return array(
View
6 app/protected/core/views/SequentialProcessView.php
@@ -79,10 +79,9 @@ public function __construct($route, $nextStep, $nextParams, $message, $completio
protected function renderContent()
{
$content = '<div class="process-container-view">' . "\n";
- $content .= '<h3><span id="import-preloader"><span class="z-spinner"></span></span>' . $this->message . '</h3>';
+ $content .= '<h3><span id="sequential-process-spinner"><span class="z-spinner"></span></span>' . $this->message . '</h3>';
$content .= "<span id='" . $this->getProgressBarId() . "-msg'></span>";
$content .= '</div>';
- $content .= '<script type="text/javascript">makeSmallLoadingSpinner("import-preloader", "dark")</script>';
$this->registerAjaxScript();
return $content;
}
@@ -108,7 +107,8 @@ protected function registerAjaxScript()
'update' => '#' . $this->containerViewId,
));
$script .= '$(\'#' . $this->getProgressBarId() . '\').progressbar({value: ' . $this->getProgressValue() . '});';
- Yii::app()->clientScript->registerScript('sequentialProcess', $script);
+ $script .= 'makeSmallLoadingSpinner("sequential-process-spinner", "dark");';
+ Yii::app()->clientScript->registerScript('sequentialProcess', $script);
}
protected function getProgressValue()
View
43 app/protected/core/widgets/AmChart.php
@@ -0,0 +1,43 @@
+<?php
+ /*********************************************************************************
+ * Zurmo is a customer relationship management program developed by
+ * Zurmo, Inc. Copyright (C) 2012 Zurmo Inc.
+ *
+ * Zurmo is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License version 3 as published by the
+ * Free Software Foundation with the addition of the following permission added
+ * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK
+ * IN WHICH THE COPYRIGHT IS OWNED BY ZURMO, ZURMO DISCLAIMS THE WARRANTY
+ * OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
+ *
+ * Zurmo is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, see http://www.gnu.org/licenses or write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ *
+ * You can contact Zurmo, Inc. with a mailing address at 113 McHenry Road Suite 207,
+ * Buffalo Grove, IL 60089, USA. or at email address contact@zurmo.com.
+ ********************************************************************************/
+
+ /**
+ * Render a fusion chart that can be formatted.
+ */
+ class AmChart extends ZurmoWidget
+ {
+ public $scriptFile = 'amcharts.js';
+
+ public $assetFolderName = 'amChart';
+
+ public $id;
+
+ public function run()
+ {
+ echo "<div id='chartContainer{$this->id}' style='width: 100%; height: 400px;'></div>";
+ }
+ }
+?>
View
386 app/protected/core/widgets/assets/amChart/amcharts.js
386 additions, 0 deletions not shown
View
294 app/protected/extensions/amcharts/AmChartMaker.php
@@ -0,0 +1,294 @@
+<?php
+ /*********************************************************************************
+ * Zurmo is a customer relationship management program developed by
+ * Zurmo, Inc. Copyright (C) 2012 Zurmo Inc.
+ *
+ * Zurmo is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License version 3 as published by the
+ * Free Software Foundation with the addition of the following permission added
+ * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK
+ * IN WHICH THE COPYRIGHT IS OWNED BY ZURMO, ZURMO DISCLAIMS THE WARRANTY
+ * OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
+ *
+ * Zurmo is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, see http://www.gnu.org/licenses or write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ *
+ * You can contact Zurmo, Inc. with a mailing address at 113 McHenry Road Suite 207,
+ * Buffalo Grove, IL 60089, USA. or at email address contact@zurmo.com.
+ ********************************************************************************/
+
+ class AmChartMaker
+ {
+ public $type = null;
+
+ public $data = null;
+
+ public $height = 300;
+
+ public $valueField = 'value';
+
+ public $categoryField = 'displayLabel';
+
+ public $chartIs3d = false;
+
+ public $chartIsPie = false;
+
+ public $xAxisName = null;
+
+ public $yAxisName = null;
+
+ private $serial = array();
+ private $chartProperties = array();
+
+ private $graphProperties = array();
+
+ private $valueAxisProperties = array();
+
+ private $categoryAxisProperties = array();
+
+ /**
+ * Returns the type of chart to be used in AmChart
+ */
+ private function addChartPropertiesByType()
+ {
+ $colorTheme = array(
+ 1 => '["#262877", "#6625A7", "#BC9DDA", "#817149", "#A77425"]',
+ 2 => '["#262877", "#7BB730"]',
+ 3 => '["#262877", "#3E44C3", "#585A8E", "#777AC1", "#151741", "#7BB730"]',
+ 4 => '["#2a7a8c", "#176273", "#063540", "#e5d9cf", "#403d3a", "#262877", "#3e42c3", "#58598e",
+ "#797bc3", "#161744", "#00261c", "#044c29", "#167f39", "#45bf55", "#96ed89", "#007828",
+ "#075220", "#1d9e48", "#375d3b", "#183128", "#012426", "#027353", "#1c2640", "#263357",
+ "#384c80", "#4e6ab2", "#5979cd"]',
+ 5 => '["#262877", "#5979cd"]',
+ );
+ $this->addChartProperties('fontFamily', '"Arial"');
+ $this->addChartProperties('color', '"#545454"');
+ $this->addChartProperties('lineColor', '"#545454"');
+ $this->addValueAxisProperties('axisColor', '"#545454"');
+ $this->addValueAxisProperties('gridColor', '"#545454"');
+ $this->addChartProperties('colors', $colorTheme[4]);
+ if ($this->type === "Column2D")
+ {
+ $currencySymbol = Yii::app()->locale->getCurrencySymbol(Yii::app()->currencyHelper->getCodeForCurrentUserForDisplay());
+ //Chart
+ $this->addChartProperties('usePrefixes', true);
+ $this->addChartProperties('plotAreaBorderColor', "'#000000'");
+ $this->addChartProperties('plotAreaBorderAlpha', 0);
+ //Graph
+ $this->addGraphProperties('fillAlphas', 1);
+ $this->addGraphProperties('cornerRadiusTop', 0);
+ $this->addGraphProperties('cornerRadiusBottom', 0);
+ $this->addGraphProperties('lineAlpha', 0);
+ $this->addGraphProperties('fillColors', $colorTheme[5]);
+ //Axis
+ $this->addCategoryAxisProperties('title', "'{$this->xAxisName}'");
+ $this->addCategoryAxisProperties('inside', 0);
+ $this->addCategoryAxisProperties('fillColors', $colorTheme[5]);
+ //ValueAxis
+ $this->addValueAxisProperties('title', "'$this->yAxisName'");
+ $this->addValueAxisProperties('minimum', 0);
+ $this->addValueAxisProperties('dashLength', 2);
+ $this->addValueAxisProperties('usePrefixes', 1);
+ $this->addValueAxisProperties('unitPosition', "'left'");
+ $this->addValueAxisProperties('unit', "'{$currencySymbol}'");
+ }
+ elseif ($this->type === "Column3D")
+ {
+ $this->addGraphProperties('balloonText', "'[[category]]:[[value]]'");
+ $this->addGraphProperties('lineAlpha', 0.5);
+ $this->addGraphProperties('fillAlphas', 1);
+ $this->addGraphProperties('fillColors', $colorTheme[5]);
+ $this->makeChart3d();
+ }
+ elseif ($this->type === "Bar2D")
+ {
+ $this->addChartProperties('rotate', true);
+ $this->addChartProperties('usePrefixes', true);
+ $this->addGraphProperties('plotAreaBorderAlpha', 0);
+ $this->addGraphProperties('lineAlpha', 0);
+ $this->addGraphProperties('fillAlphas', 1);
+ $this->addGraphProperties('fillColors', $colorTheme[5]);
+ $this->addGraphProperties('gradientOrientation', "'vertical'");
+ $this->addGraphProperties('labelPosition', "'right'");
+ $this->addGraphProperties('labelText', "'[[category]]: [[value]]'");
+ $this->addGraphProperties('balloonText', "'[[category]]: [[value]]'");
+ }
+ elseif ($this->type === "Donut2D")
+ {
+ $this->addChartProperties('sequencedAnimation', true);
+ $this->addChartProperties('startEffect', "'elastic'");
+ $this->addChartProperties('innerRadius', "'30%'");
+ $this->addChartProperties('startDuration', 2);
+ $this->addChartProperties('labelRadius', 15);
+ $this->addChartProperties('usePrefixes', true);
+ $this->chartIsPie = true;
+ }
+ elseif ($this->type === "Pie2D")
+ {
+ $this->addChartProperties('outlineColor', "'#FFFFFF'");
+ $this->addChartProperties('outlineAlpha', 0.8);
+ $this->addChartProperties('outlineThickness', 2);
+ $this->addChartProperties('usePrefixes', true);
+ $this->chartIsPie = true;
+ }
+ elseif ($this->type === "Pie3D")
+ {
+ $this->addChartProperties('outlineColor', "'#FFFFFF'");
+ $this->addChartProperties('outlineAlpha', 0.8);
+ $this->addChartProperties('outlineThickness', 2);
+ $this->addChartProperties('usePrefixes', true);
+ $this->makeChart3d();
+ $this->chartIsPie = true;
+ }
+ else
+ {
+ //Default graph
+ }
+ }
+
+ private function convertDataArrayToJavascriptArray()
+ {
+ return CJavaScript::encode($this->data);
+ }
+
+ public function makeChart3d()
+ {
+ $this->addChartProperties('depth3D', 15);
+ $this->addChartProperties('angle', 30);
+ $this->chartIs3d = true;
+ }
+
+ /**
+ * Add Serial Graph to SerialChart
+ * $valuefield: string
+ * $type: string (column, line)
+ */
+ public function addSerialGraph($valueField, $type, $options = array())
+ {
+ array_push($this->serial, array(
+ 'valueField' => $valueField,
+ 'type' => $type,
+ 'options' => $options));
+ }
+
+ /**
+ * Add properties to chart
+ * Info on http://www.amcharts.com/docs/v.2/javascript_reference/amchart
+ */
+ public function addChartProperties($tag, $value)
+ {
+ $this->chartProperties[$tag] = $value;
+ }
+
+ /**
+ * Add properties to valueAxis
+ * Info on info on http://www.amcharts.com/docs/v.2/javascript_reference/axisbase
+ */
+ public function addValueAxisProperties($tag, $value)
+ {
+ $this->valueAxisProperties[$tag] = $value;
+ }
+
+ /**
+ * Add properties to categoryAxis
+ * Info on http://www.amcharts.com/docs/v.2/javascript_reference/axisbase
+ */
+ public function addCategoryAxisProperties($tag, $value)
+ {
+ $this->categoryAxisProperties[$tag] = $value;
+ }
+
+ /**
+ * Add properties to Serial Graph - column or bar properties
+ * Info on http://www.amcharts.com/docs/v.2/javascript_reference/amgraph
+ */
+ public function addGraphProperties($tag, $value)
+ {
+ $this->graphProperties[$tag] = $value;
+ }
+
+ public function javascriptChart()
+ {
+ //Init AmCharts
+ $this->addChartPropertiesByType();
+ $javascript = "var chartData = ". $this->convertDataArrayToJavascriptArray() . ";";
+ $javascript .=" $(document).ready(function () { ";
+ //Make chart Pie or Serial
+ if ($this->chartIsPie)
+ {
+ $javascript .="
+ var chart = new AmCharts.AmPieChart();
+ chart.dataProvider = chartData;
+ chart.titleField = '{$this->categoryField}';
+ chart.valueField = '". $this->valueField . "';";
+ }
+ else
+ {
+ //Init the AmSerialGraph
+ $javascript .="
+ var chart = new AmCharts.AmSerialChart();
+ chart.dataProvider = chartData;
+ chart.categoryField = '{$this->categoryField}';
+ ";
+ }
+ //Add chart properties
+ foreach ($this->chartProperties as $tag => $chartProperty)
+ {
+ $javascript .= "chart." . $tag . " = " . $chartProperty . ";";
+ }
+
+ if (!$this->chartIsPie)
+ {
+ //Add serial as graph
+ foreach ($this->serial as $key => $serial)
+ {
+ $javascript .= "var graph{$key} = new AmCharts.AmGraph();
+ window.g1 = graph{$key};
+ graph{$key}.valueField = '". $serial['valueField'] ."';
+ graph{$key}.type = '" . $serial['type'] . "';";
+ if(count($serial['options']) == 0)
+ {
+ //Add graph properties from GraphType
+ foreach($this->graphProperties as $graphTag => $graphOption)
+ {
+ $javascript .= "graph{$key}." . $graphTag . " = " . $graphOption . ";";
+ }
+ }
+ else
+ {
+ //Add graph properties from option passed
+ foreach($serial['options'] as $graphTag => $graphOption)
+ {
+ $javascript .= "graph{$key}." . $graphTag . " = " . $graphOption . ";";
+ }
+ }
+ $javascript .= "chart.addGraph(graph{$key});";
+ }
+ //Add categoryAxis properties from GraphType
+ $javascript .= "var categoryAxis = chart.categoryAxis;";
+ foreach($this->categoryAxisProperties as $tag => $option)
+ {
+ $javascript .= "categoryAxis." . $tag . " = " . $option . ";";
+ }
+ //Add valueAxis properties from GraphType
+ $javascript .= "var valueAxis = new AmCharts.ValueAxis();";
+ foreach($this->valueAxisProperties as $tag => $option)
+ {
+ $javascript .= "valueAxis." . $tag . " = " . $option . ";";
+ }
+ $javascript .= "chart.addValueAxis(valueAxis);";
+ }
+ //Write chart
+ $javascript .= "chart.write('chartContainer{$this->id}');
+ });";
+ return $javascript;
+ }
+ }
+?>
View
2  app/protected/extensions/minscript/components/ExtMinScript.php
@@ -157,6 +157,8 @@ public function generateUrl($group) {
$params['g'] = $group;
//Files
foreach ($groupMap[$group] as $path) {
+ // Replace THEME_NAME with real theme
+ $path = str_replace('THEME_NAME', Yii::app()->theme->name, $path);
$filemtime = @filemtime($path);
if ($filemtime !== false) {
$filemtimes[] = $filemtime;
View
18 app/protected/modules/accounts/controllers/DefaultController.php
@@ -139,7 +139,9 @@ public function actionMassEdit()
$dataProvider = $this->getDataProviderByResolvingSelectAllFromGet(
new AccountsSearchForm($account),
$pageSize,
- Yii::app()->user->userModel->id);
+ Yii::app()->user->userModel->id,
+ null,
+ 'AccountsSearchView');
$selectedRecordCount = $this->getSelectedRecordCountByResolvingSelectAllFromGet($dataProvider);
$account = $this->processMassEdit(
$pageSize,
@@ -176,7 +178,9 @@ public function actionMassEditProgressSave()
$dataProvider = $this->getDataProviderByResolvingSelectAllFromGet(
new AccountsSearchForm($account),
$pageSize,
- Yii::app()->user->userModel->id
+ Yii::app()->user->userModel->id,
+ null,
+ 'AccountsSearchView'
);
$this->processMassEditProgressSave(
'Account',
@@ -210,7 +214,9 @@ public function actionMassDelete()
$dataProvider = $this->getDataProviderByResolvingSelectAllFromGet(
new AccountsSearchForm($account),
$pageSize,
- Yii::app()->user->userModel->id);
+ Yii::app()->user->userModel->id,
+ null,
+ 'AccountsSearchView');
$selectedRecordCount = $this->getSelectedRecordCountByResolvingSelectAllFromGet($dataProvider);
$account = $this->processMassDelete(
$pageSize,
@@ -247,7 +253,9 @@ public function actionMassDeleteProgress()
$dataProvider = $this->getDataProviderByResolvingSelectAllFromGet(
new AccountsSearchForm($account),
$pageSize,
- Yii::app()->user->userModel->id
+ Yii::app()->user->userModel->id,
+ null,
+ 'AccountsSearchView'
);
$this->processMassDeleteProgress(
'Account',
@@ -282,7 +290,7 @@ protected static function getSearchFormClassName()
public function actionExport()
{
- $this->export();
+ $this->export('AccountsSearchView');
}
}
?>
View
5 app/protected/modules/activities/views/LatestActivitiesListView.php
@@ -162,6 +162,11 @@ protected function getCGridViewLastColumn()
return array();
}
+ protected static function getPagerCssClass()
+ {
+ return 'pager horizontal';
+ }
+
protected function getCGridViewPagerParams()
{
return array(
View
5 app/protected/modules/activities/views/related/AllLatestActivitiesListView.php
@@ -35,6 +35,11 @@ class AllLatestActivitiesListView extends LatestActivitiesListView
*/
protected $showRollUpToggle = false;
+ protected static function getPagerCssClass()
+ {
+ return 'pager horizontal';
+ }
+
protected function getCGridViewPagerParams()
{
return array(
View
41 app/protected/modules/contacts/controllers/DefaultController.php
@@ -152,10 +152,11 @@ public function actionMassEdit()
$contact = new Contact(false);
$activeAttributes = $this->resolveActiveAttributesFromMassEditPost();
$dataProvider = $this->getDataProviderByResolvingSelectAllFromGet(
- new ContactsSearchForm($contact),
- $pageSize,
- Yii::app()->user->userModel->id,
- 'ContactsStateMetadataAdapter');
+ new ContactsSearchForm($contact),
+ $pageSize,
+ Yii::app()->user->userModel->id,
+ 'ContactsStateMetadataAdapter',
+ 'ContactsSearchView');
$selectedRecordCount = $this->getSelectedRecordCountByResolvingSelectAllFromGet($dataProvider);
$contact = $this->processMassEdit(
$pageSize,
@@ -190,11 +191,11 @@ public function actionMassEditProgressSave()
'massEditProgressPageSize');
$contact = new Contact(false);
$dataProvider = $this->getDataProviderByResolvingSelectAllFromGet(
- new ContactsSearchForm($contact),
- $pageSize,
- Yii::app()->user->userModel->id,
- 'ContactsStateMetadataAdapter'
- );
+ new ContactsSearchForm($contact),
+ $pageSize,
+ Yii::app()->user->userModel->id,
+ 'ContactsStateMetadataAdapter',
+ 'ContactsSearchView');
$this->processMassEditProgressSave(
'Contact',
$pageSize,
@@ -225,11 +226,11 @@ public function actionMassDelete()
$activeAttributes = $this->resolveActiveAttributesFromMassDeletePost();
$dataProvider = $this->getDataProviderByResolvingSelectAllFromGet(
- new ContactsSearchForm($contact),
- $pageSize,
- Yii::app()->user->userModel->id,
- 'ContactsStateMetadataAdapter'
- );
+ new ContactsSearchForm($contact),
+ $pageSize,
+ Yii::app()->user->userModel->id,
+ 'ContactsStateMetadataAdapter',
+ 'ContactsSearchView');
$selectedRecordCount = $this->getSelectedRecordCountByResolvingSelectAllFromGet($dataProvider);
$contact = $this->processMassDelete(
$pageSize,
@@ -264,11 +265,11 @@ public function actionMassDeleteProgress()
'massDeleteProgressPageSize');
$contact = new Contact(false);
$dataProvider = $this->getDataProviderByResolvingSelectAllFromGet(
- new ContactsSearchForm($contact),
- $pageSize,
- Yii::app()->user->userModel->id,
- 'ContactsStateMetadataAdapter'
- );
+ new ContactsSearchForm($contact),
+ $pageSize,
+ Yii::app()->user->userModel->id,
+ 'ContactsStateMetadataAdapter',
+ 'ContactsSearchView');
$this->processMassDeleteProgress(
'Contact',
$pageSize,
@@ -332,7 +333,7 @@ protected static function getSearchFormClassName()
public function actionExport()
{
- $this->export();
+ $this->export('ContactsSearchView');
}
}
?>
View
21 ...protected/modules/conversations/elements/derived/OnChangeProcessMultiplePeopleForConversationElement.php
@@ -31,12 +31,6 @@
*/
class OnChangeProcessMultiplePeopleForConversationElement extends MultiplePeopleForConversationElement
{
- protected function renderControlEditable()
- {
- return self::renderNotificationBar(self::getNotificationBarId()) .
- parent::renderControlEditable();
- }
-
protected function getOnAddContent()
{
return 'function(item){ ' . $this->renderOnAddOrDeleteAjaxScript() . '}';
@@ -47,22 +41,9 @@ protected function getOnDeleteContent()
return 'function(item){ ' . $this->renderOnAddOrDeleteAjaxScript() . '}';
}
- protected static function renderNotificationBar($barId)
- {
- $content = '<div id = "' . $barId . '"></div>';
- $cClipWidget = new CClipWidget();
- $cClipWidget->beginClip("conversationParticipantsNotificationMessage");
- $cClipWidget->widget('application.core.widgets.JNotify', array(
- 'statusBarId' => $barId,
- ));
- $cClipWidget->endClip();
- $content .= $cClipWidget->getController()->clips['conversationParticipantsNotificationMessage'];
- return $content;
- }
-
protected static function getNotificationBarId()
{
- return 'NotificationBar';
+ return 'FlashMessageBar';
}
/**
View
67 app/protected/modules/emailMessages/jobs/EmailArchivingJob.php
@@ -70,42 +70,49 @@ public static function getRunTimeThresholdInSeconds()
public function run()
{
self::$jobOwnerUserModel = Yii::app()->user->userModel;
- Yii::app()->imap->connect();
-
- $lastImapCheckTime = EmailMessagesModule::getLastImapDropboxCheckTime();
- if (isset($lastImapCheckTime) && $lastImapCheckTime != '')
+ if(Yii::app()->imap->connect())
{
- $criteria = "SINCE \"{$lastImapCheckTime}\" UNDELETED";
- $lastImapCheckTimeStamp = strtotime($lastImapCheckTime);
- }
- else
- {
- $criteria = "ALL UNDELETED";
- $lastImapCheckTimeStamp = 0;
- }
- $messages = Yii::app()->imap->getMessages($criteria, $lastImapCheckTimeStamp);
-
- $lastCheckTime = null;
- if (count($messages))
- {
- foreach ($messages as $message)
+ $lastImapCheckTime = EmailMessagesModule::getLastImapDropboxCheckTime();
+ if (isset($lastImapCheckTime) && $lastImapCheckTime != '')
{
- Yii::app()->user->userModel = self::$jobOwnerUserModel;
- $lastMessageCreatedTime = strtotime($message->createdDate);
- if (strtotime($message->createdDate) > strtotime($lastCheckTime))
- {
- $lastCheckTime = $message->createdDate;
- }
- $this->saveEmailMessage($message);
+ $criteria = "SINCE \"{$lastImapCheckTime}\" UNDELETED";
+ $lastImapCheckTimeStamp = strtotime($lastImapCheckTime);
}
- Yii::app()->user->userModel = self::$jobOwnerUserModel;
- Yii::app()->imap->expungeMessages();
- if ($lastCheckTime != '')
+ else
{
- EmailMessagesModule::setLastImapDropboxCheckTime($lastCheckTime);
+ $criteria = "ALL UNDELETED";
+ $lastImapCheckTimeStamp = 0;
}
+ $messages = Yii::app()->imap->getMessages($criteria, $lastImapCheckTimeStamp);
+
+ $lastCheckTime = null;
+ if (count($messages))
+ {
+ foreach ($messages as $message)
+ {
+ Yii::app()->user->userModel = self::$jobOwnerUserModel;
+ $lastMessageCreatedTime = strtotime($message->createdDate);
+ if (strtotime($message->createdDate) > strtotime($lastCheckTime))
+ {
+ $lastCheckTime = $message->createdDate;
+ }
+ $this->saveEmailMessage($message);
+ }
+ Yii::app()->user->userModel = self::$jobOwnerUserModel;
+ Yii::app()->imap->expungeMessages();
+ if ($lastCheckTime != '')
+ {
+ EmailMessagesModule::setLastImapDropboxCheckTime($lastCheckTime);
+ }
+ }
+ return true;
+ }
+ else
+ {
+ $messageContent = Yii::t('Default', 'Failed to connect to mailbox');
+ $this->errorMessage = $messageContent;
+ return false;
}
- return true;
}
/**
View
1  app/protected/modules/install/utils/InstallUtil.php
@@ -604,6 +604,7 @@ public static function autoBuildDatabase(& $messageLogger)
$rootModels = array_merge($rootModels, array_diff($moduleAndDependenciesRootModelNames, $rootModels));
}
RedBeanDatabaseBuilderUtil::autoBuildModels($rootModels, $messageLogger);
+ ZurmoDatabaseCompatibilityUtil::createStoredFunctionsAndProcedures();
}
/**
View
5 app/protected/modules/jobsManager/views/JobLogsModalListView.php
@@ -32,6 +32,11 @@ public function __construct($controllerId, $moduleId, $modelClassName, $dataProv
$this->rowsAreSelectable = false;
}
+ protected static function getPagerCssClass()
+ {
+ return 'pager horizontal';
+ }
+
protected function getCGridViewPagerParams()
{
return array(
View
35 app/protected/modules/leads/controllers/DefaultController.php
@@ -163,7 +163,8 @@ public function actionMassEdit()
new LeadsSearchForm($contact),
$pageSize,
Yii::app()->user->userModel->id,
- 'LeadsStateMetadataAdapter');
+ 'LeadsStateMetadataAdapter',
+ 'LeadsSearchView');
$selectedRecordCount = $this->getSelectedRecordCountByResolvingSelectAllFromGet($dataProvider);
$contact = $this->processMassEdit(
$pageSize,
@@ -198,11 +199,11 @@ public function actionMassEditProgressSave()
'massEditProgressPageSize');
$contact = new Contact(false);
$dataProvider = $this->getDataProviderByResolvingSelectAllFromGet(
- new LeadsSearchForm($contact),
- $pageSize,
- Yii::app()->user->userModel->id,
- 'LeadsStateMetadataAdapter'
- );
+ new LeadsSearchForm($contact),
+ $pageSize,
+ Yii::app()->user->userModel->id,
+ 'LeadsStateMetadataAdapter',
+ 'LeadsSearchView');
$this->processMassEditProgressSave(
'Contact',
$pageSize,
@@ -233,11 +234,11 @@ public function actionMassDelete()
$activeAttributes = $this->resolveActiveAttributesFromMassDeletePost();
$dataProvider = $this->getDataProviderByResolvingSelectAllFromGet(
- new LeadsSearchForm($contact),
- $pageSize,
- Yii::app()->user->userModel->id,
- 'LeadsStateMetadataAdapter'
- );
+ new LeadsSearchForm($contact),
+ $pageSize,
+ Yii::app()->user->userModel->id,
+ 'LeadsStateMetadataAdapter',
+ 'LeadsSearchView');
$selectedRecordCount = $this->getSelectedRecordCountByResolvingSelectAllFromGet($dataProvider);
$contact = $this->processMassDelete(
$pageSize,
@@ -272,11 +273,11 @@ public function actionMassDeleteProgress()
'massDeleteProgressPageSize');