Permalink
Browse files

version 0.7.80

  • Loading branch information...
1 parent b94b6eb commit aea8eb48c61a047deb389deb7fb42269150fb80d @zurmo committed Nov 14, 2012
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 ...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 ...a/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 ...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 ...ted/modules/email_messages/controllers/filters/_email_configuration_check_controller_filter.php.i
  46. BIN ...odules/email_messages/controllers/filters/_user_email_configuration_check_controller_filter.php.i
  47. BIN ...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 ...rotected/modules/email_messages/elements/derived/_email_message_all_recipient_types_element.php.i
  50. BIN ...app/protected/modules/email_messages/elements/derived/_email_message_bcc_recipients_element.php.i
  51. BIN .../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 ...app/protected/modules/email_messages/views/_contact_requires_primary_email_first_modal_view.php.i
  70. BIN ...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 ...ore/data/app/protected/modules/email_messages/views/_no_global_email_configuration_yet_view.php.i
  74. BIN ...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 ...tore/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 ...ta/app/protected/modules/reports/adapters/_model_relations_and_attributes_to_report_adapter.php.i
  83. BIN ...modules/reports/adapters/_model_relations_and_attributes_to_rows_and_columns_report_adapter.php.i
  84. BIN ...tected/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 ...p/protected/modules/reports/tests/unit/_model_relation_and_attribute_to_report_adapter_test.php.i
  90. BIN ...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 ...e/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 ...e/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 .../conversa/elements/derived/onchangeprocessmultiplepeoplf7091d63b17a40ce214d22af4d33155d35e57cd2.i
  167. BIN .../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 ...ed/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
@@ -1,61 +1,65 @@
-2d8566c0b4ee6aaec71e6fee0df5820231ac6b45 4356
+f453eebc034cd6530c75255b9759f524c5dcf272 4453
dc87114b543cef2e514caaf53158a0cec6c16ba7 apiMergeWithDefault
+f453eebc034cd6530c75255b9759f524c5dcf272 default
528aeb46da83bbc059a81856f22080d3afcbafcc 0.6.9-development
b54558ec1152000af342afa1a8e8d71e410fd308 newuserinterface
cbe3d8bd7bb9330cdce8032993dc2126676b4d05 additionalApiFeatures
2653dd0a3d797fbe612f7b80af3f99dfa70a4d28 webApi2
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
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
View
@@ -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
Binary file not shown.
View
@@ -1,3 +1,3 @@
-4078
+4357
pull
https://bitbucket.org/zurmo/zurmo
View
Binary file not shown.
View
@@ -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
@@ -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;
@@ -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'))
{
@@ -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}';
}
@@ -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),
));
@@ -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'
@@ -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'
@@ -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)');
@@ -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
}
@@ -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(
@@ -136,6 +136,11 @@ protected function getCreateLinkRouteParameters()
);
}
+ protected static function getPagerCssClass()
+ {
+ return 'pager horizontal';
+ }
+
protected function getCGridViewPagerParams()
{
return array(
@@ -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()
Oops, something went wrong.

0 comments on commit aea8eb4

Please sign in to comment.