3619150e237feabb9ea36945141914fa54c5f117 Mike Dvorkin mike@dvorkin.net http://github.com/michaeldv/fat_free_crm/commit/e6d0d9664a1c9771b14cc266556b514e46546828 e6d0d9664a1c9771b14cc266556b514e46546828 2009-12-20T16:30:25-08:00 2009-12-20T16:30:25-08:00 Merged in I18n branch: Fat Free CRM could be easily localized now by dropping in config/locales file 822f3e9299a7acf95865879e7e681ad1ac910a70 Mike Dvorkin mike@dvorkin.net cd2dc13274772c52648be530373a5f8785ef9318 76a5768c7181a383823829abb8326e8f41926aee Mike Dvorkin mike@dvorkin.net http://github.com/michaeldv/fat_free_crm/commit/3619150e237feabb9ea36945141914fa54c5f117 3619150e237feabb9ea36945141914fa54c5f117 2009-12-20T13:44:04-08:00 2009-12-20T13:44:04-08:00 Merge branch 'master' into i18n df4dc623244475b4c93d9027e70f6748693d5db4 Mike Dvorkin mike@dvorkin.net ff2d717ed4f960176710deeebd684ab402f6eae5 Mike Dvorkin mike@dvorkin.net http://github.com/michaeldv/fat_free_crm/commit/76a5768c7181a383823829abb8326e8f41926aee 76a5768c7181a383823829abb8326e8f41926aee 2009-12-20T13:32:21-08:00 2009-12-20T13:32:21-08:00 Fixed Apache/Passenger issue of not being able to load tab settings 588cbff6e2bf5fc5c32dbb489a7a23724ada4ecb Mike Dvorkin mike@dvorkin.net c064cb515dc1309560660c171ab726458f34c910 Mike Dvorkin mike@dvorkin.net http://github.com/michaeldv/fat_free_crm/commit/ff2d717ed4f960176710deeebd684ab402f6eae5 ff2d717ed4f960176710deeebd684ab402f6eae5 2009-12-20T13:17:25-08:00 2009-12-20T13:17:25-08:00 Fixed deprecation warning when adding a new comment 1ef99ac535bc4eae749238f73d9eabe5eff822f7 Mike Dvorkin mike@dvorkin.net 1bfcca45efa0d216b3a88dd766343c6d20b682b3 Mike Dvorkin mike@dvorkin.net http://github.com/michaeldv/fat_free_crm/commit/cd2dc13274772c52648be530373a5f8785ef9318 cd2dc13274772c52648be530373a5f8785ef9318 2009-12-20T13:08:12-08:00 2009-12-20T13:08:12-08:00 Refactored :time_ago translation 8e4e430c3620cb73dfbf6dea4cdeaa0a1158023f Mike Dvorkin mike@dvorkin.net ced61fbdc750f25bc2265794995361280cb371bc c064cb515dc1309560660c171ab726458f34c910 Mike Dvorkin mike@dvorkin.net http://github.com/michaeldv/fat_free_crm/commit/1bfcca45efa0d216b3a88dd766343c6d20b682b3 1bfcca45efa0d216b3a88dd766343c6d20b682b3 2009-12-16T23:52:21-08:00 2009-12-16T23:52:21-08:00 Resolved merge conflicts fb7e022e78e93ffae2ef0b99cef6c31f818ffc67 Mike Dvorkin mike@dvorkin.net fa8ff46e4c69ef82a3cf9a329620e584317fa534 Mike Dvorkin mike@dvorkin.net http://github.com/michaeldv/fat_free_crm/commit/c064cb515dc1309560660c171ab726458f34c910 c064cb515dc1309560660c171ab726458f34c910 2009-12-14T20:33:37-08:00 2009-12-14T20:33:37-08:00 Make sure no activity records are left behind when model record gets deleted from the database 5e8e486465b0b350fcf3c0f8e73b23b7854011c4 Mike Dvorkin mike@dvorkin.net 5ef3da57fa7dda9277e62256382e4f494229a21c Mike Dvorkin mike@dvorkin.net http://github.com/michaeldv/fat_free_crm/commit/fa8ff46e4c69ef82a3cf9a329620e584317fa534 fa8ff46e4c69ef82a3cf9a329620e584317fa534 2009-12-13T20:34:44-08:00 2009-12-13T20:34:44-08:00 Fixed broken sidebar search in Admin/Users; refactored sidebar rendering to make it more robust a0667ff70f1d67f4204ea0264a0169ff5b5e699f Mike Dvorkin mike@dvorkin.net bf185fb17599571c19615d8444cf4ebd5251e82b 5ef3da57fa7dda9277e62256382e4f494229a21c Mike Dvorkin mike@dvorkin.net http://github.com/michaeldv/fat_free_crm/commit/ced61fbdc750f25bc2265794995361280cb371bc ced61fbdc750f25bc2265794995361280cb371bc 2009-12-12T17:37:33-08:00 2009-12-12T17:37:33-08:00 Merge branch 'master' into i18n 83ae9c53a9c122cc61ba3b1929982d5f6f699eec Mike Dvorkin mike@dvorkin.net d6f760df567f0959905171e85b2635ce6911a108 Mike Dvorkin mike@dvorkin.net http://github.com/michaeldv/fat_free_crm/commit/5ef3da57fa7dda9277e62256382e4f494229a21c 5ef3da57fa7dda9277e62256382e4f494229a21c 2009-12-12T17:37:04-08:00 2009-12-12T17:37:04-08:00 Upgraded [simple_column_search] plugin that adds search support for Postgres 09cc0de0b271f7b92d4d0c9256bdd53568f1247a Mike Dvorkin mike@dvorkin.net 0a46e50178caae7509cc77b60ce15bb203c55bb6 d6f760df567f0959905171e85b2635ce6911a108 Mike Dvorkin mike@dvorkin.net http://github.com/michaeldv/fat_free_crm/commit/bf185fb17599571c19615d8444cf4ebd5251e82b bf185fb17599571c19615d8444cf4ebd5251e82b 2009-12-12T17:03:19-08:00 2009-12-12T17:03:19-08:00 Merge branch 'master' into i18n 14c9e0e9db2c0c95a040d7ffeddf73c9f8c31660 Mike Dvorkin mike@dvorkin.net df3e77f78f1e70c6da0b144423b40aa810cae2ec Mike Dvorkin mike@dvorkin.net http://github.com/michaeldv/fat_free_crm/commit/0a46e50178caae7509cc77b60ce15bb203c55bb6 0a46e50178caae7509cc77b60ce15bb203c55bb6 2009-12-12T17:02:47-08:00 2009-12-12T17:02:47-08:00 More I18n tweaks 50ec1480da36cb0fc79a829ec981a92176c1e61a Mike Dvorkin mike@dvorkin.net dba70430028fbabb8619f9af46dec00118969008 e5a85912eef6216f57c6a4eeadb56de7419ff4e8 Lana Dvorkin lana@dvorkin.net http://github.com/michaeldv/fat_free_crm/commit/df3e77f78f1e70c6da0b144423b40aa810cae2ec df3e77f78f1e70c6da0b144423b40aa810cae2ec 2009-12-12T15:38:28-08:00 2009-12-12T15:38:28-08:00 Merge branch 'michaeldv/i18n' 8a9d5f57fae53b9999665d5a12ae5c2b770e3df4 Lana Dvorkin lana@dvorkin.net b384363f360a411b379697161e5815aa04b8833f Lana Dvorkin lana@dvorkin.net http://github.com/michaeldv/fat_free_crm/commit/dba70430028fbabb8619f9af46dec00118969008 dba70430028fbabb8619f9af46dec00118969008 2009-12-12T15:31:48-08:00 2009-12-12T15:31:48-08:00 Some more I18n tweaks for views 3506cf7b069a4aee208511c3a3fa064f30e536c5 Lana Dvorkin lana@dvorkin.net 73cca235c465ff57fd7b638064119396e7ee1c9c Tom Meier ozmeier@yahoo.co.uk http://github.com/michaeldv/fat_free_crm/commit/d6f760df567f0959905171e85b2635ce6911a108 d6f760df567f0959905171e85b2635ce6911a108 2009-12-07T19:32:15-08:00 2009-12-07T18:07:24-08:00 [fix] Activity monitor doesn't fail when altering deleted records e90e4ec6d66c0a451a546741e87200274e2533db Michael Dvorkin mike@dvorkin.net b384363f360a411b379697161e5815aa04b8833f Apirak Panatkool apirakb@gmail.com http://github.com/michaeldv/fat_free_crm/commit/e5a85912eef6216f57c6a4eeadb56de7419ff4e8 e5a85912eef6216f57c6a4eeadb56de7419ff4e8 2009-12-03T22:03:23-08:00 2009-12-02T01:46:15-08:00 Edit thai translation file follow EN (cherry picked from commit 0b6acf58e68bf610e3f5c323efe02373ba854c2e) 090731b6fce7aeb2e15bf383c5ebaeba39699768 Mike Dvorkin mike@dvorkin.net b567435a818bdaba2e2a9811e9ce878a3bf59ec7 Mike Dvorkin mike@dvorkin.net http://github.com/michaeldv/fat_free_crm/commit/b384363f360a411b379697161e5815aa04b8833f b384363f360a411b379697161e5815aa04b8833f 2009-11-30T22:33:04-08:00 2009-11-30T22:33:04-08:00 More cleanup in translations 7d1504d1bd821fe82ef3580db8932dbf670bd2c9 Mike Dvorkin mike@dvorkin.net ee475ac1c7cd77e820ba480f00f61131c9138b48 Mike Dvorkin mike@dvorkin.net http://github.com/michaeldv/fat_free_crm/commit/b567435a818bdaba2e2a9811e9ce878a3bf59ec7 b567435a818bdaba2e2a9811e9ce878a3bf59ec7 2009-11-30T22:10:31-08:00 2009-11-30T22:10:31-08:00 Cleaned up translations for opportunities 219345729c021858ba803ce6384b9ff0a3636b06 Mike Dvorkin mike@dvorkin.net 1f95ecd74b9ea777891491f3dddf4b870acfe60b Mike Dvorkin mike@dvorkin.net http://github.com/michaeldv/fat_free_crm/commit/ee475ac1c7cd77e820ba480f00f61131c9138b48 ee475ac1c7cd77e820ba480f00f61131c9138b48 2009-11-30T21:55:35-08:00 2009-11-30T21:55:35-08:00 Cleaned up campaign translations a396655f831b39ed57336d91b966dd9dfb63af44 Mike Dvorkin mike@dvorkin.net 910fb42950d5abc4353e10ed2ecad2bfacdddea7 Mike Dvorkin mike@dvorkin.net http://github.com/michaeldv/fat_free_crm/commit/1f95ecd74b9ea777891491f3dddf4b870acfe60b 1f95ecd74b9ea777891491f3dddf4b870acfe60b 2009-11-30T20:55:07-08:00 2009-11-30T20:55:07-08:00 Use campaign status values to generate campaign filter checkboxes 38deca7a8f0a8666772da350d35b60ffc78b6b01 Mike Dvorkin mike@dvorkin.net 54d148711d8b2adae1670ad8d1a364df03a9f40c Mike Dvorkin mike@dvorkin.net http://github.com/michaeldv/fat_free_crm/commit/910fb42950d5abc4353e10ed2ecad2bfacdddea7 910fb42950d5abc4353e10ed2ecad2bfacdddea7 2009-11-29T22:02:45-08:00 2009-11-29T22:02:45-08:00 Sorted locale keys, synced up English, Portuguese, and Russian locale files 8c8df2ece0f7668f648d26b391eabdf356b37f50 Mike Dvorkin mike@dvorkin.net 041e87ace5e71b218b721971f001c63927fbcc77 73cca235c465ff57fd7b638064119396e7ee1c9c Mike Dvorkin mike@dvorkin.net http://github.com/michaeldv/fat_free_crm/commit/54d148711d8b2adae1670ad8d1a364df03a9f40c 54d148711d8b2adae1670ad8d1a364df03a9f40c 2009-11-29T20:02:09-08:00 2009-11-29T20:02:09-08:00 Resolved merge from master conflict bb9b25d34d0d98061092932f3243dbc86338d9c5 Mike Dvorkin mike@dvorkin.net b0f6b180437da388f09540b075c105b477b5a328 Mike Dvorkin mike@dvorkin.net http://github.com/michaeldv/fat_free_crm/commit/73cca235c465ff57fd7b638064119396e7ee1c9c 73cca235c465ff57fd7b638064119396e7ee1c9c 2009-11-29T20:00:17-08:00 2009-11-29T20:00:17-08:00 Added optional PLUGIN=plugin parameter to "rake crm:settings:load" task f82e5ca6809728c5e6036134c518ac46baa83587 Mike Dvorkin mike@dvorkin.net 27b59fd29e987523ac52fc11c11d35a1fed88a38 Enderson Maia endersonmaia@gmail.com http://github.com/michaeldv/fat_free_crm/commit/041e87ace5e71b218b721971f001c63927fbcc77 041e87ace5e71b218b721971f001c63927fbcc77 2009-11-26T21:04:11-08:00 2009-11-26T16:58:51-08:00 * pt-BR updated d2f7f7d017f228ab742017b027059756da2d7f85 Michael Dvorkin mike@dvorkin.net 0a43ac43686ebeefb1d6f686b519d75659c4ff6b beaefa49ec9b1d61c94abe945efa635de5a2ed07 Mike Dvorkin mike@dvorkin.net http://github.com/michaeldv/fat_free_crm/commit/27b59fd29e987523ac52fc11c11d35a1fed88a38 27b59fd29e987523ac52fc11c11d35a1fed88a38 2009-11-26T12:59:11-08:00 2009-11-26T12:59:11-08:00 Merge branch 'i18n' of github.com:michaeldv/fat_free_crm into i18n 841f88fc8f1bb42c87002639ccfa61f11a4bc572 Mike Dvorkin mike@dvorkin.net 97496f31daf0e19ddfb1951ce86103d5c5f8b16a Mike Dvorkin mike@dvorkin.net http://github.com/michaeldv/fat_free_crm/commit/0a43ac43686ebeefb1d6f686b519d75659c4ff6b 0a43ac43686ebeefb1d6f686b519d75659c4ff6b 2009-11-26T12:54:55-08:00 2009-11-26T12:54:55-08:00 Updated translations to support model attributes 1a406a181d237bea4bb7399fd7906088992fa55b Mike Dvorkin mike@dvorkin.net 16c49218cabe28b1f1e40159a62d00ad50352ca9 6548b77bc59960e0eeca81062a47e2c99e1fc0a8 Mike Dvorkin mike@dvorkin.net http://github.com/michaeldv/fat_free_crm/commit/97496f31daf0e19ddfb1951ce86103d5c5f8b16a 97496f31daf0e19ddfb1951ce86103d5c5f8b16a 2009-11-26T10:58:54-08:00 2009-11-26T10:58:54-08:00 Merge branch 'lanadv/master' into i18n 86b6cca5513432c166bca404d03a007cc4f51b37 Mike Dvorkin mike@dvorkin.net c584c28779d5eaba7cd58c6efc1f4d23c5c295d3 Lana Dvorkin lana@dvorkin.net http://github.com/michaeldv/fat_free_crm/commit/6548b77bc59960e0eeca81062a47e2c99e1fc0a8 6548b77bc59960e0eeca81062a47e2c99e1fc0a8 2009-11-25T23:11:23-08:00 2009-11-25T23:11:23-08:00 Translated controllers and models 5e53d9213d8f6ad7b05a424733dde5b0852c3116 Lana Dvorkin lana@dvorkin.net 62b31b9e8edebabd2a2ab6c953fa505b5cbb33c3 Douglas Campos douglas@theros.info http://github.com/michaeldv/fat_free_crm/commit/beaefa49ec9b1d61c94abe945efa635de5a2ed07 beaefa49ec9b1d61c94abe945efa635de5a2ed07 2009-11-22T14:55:34-08:00 2009-11-22T13:37:51-08:00 fixed some spelling/typo on pt-BR translation Signed-off-by: Douglas Campos <douglas@theros.info> b80eb775fad86f71f5a6ac2aefc2513c057c76a3 Michael Dvorkin mike@dvorkin.net 16c49218cabe28b1f1e40159a62d00ad50352ca9 Enderson Maia endersonmaia@gmail.com http://github.com/michaeldv/fat_free_crm/commit/62b31b9e8edebabd2a2ab6c953fa505b5cbb33c3 62b31b9e8edebabd2a2ab6c953fa505b5cbb33c3 2009-11-21T22:01:51-08:00 2009-11-21T14:44:57-08:00 * Brazilian Portuguese i18n [work in progress] d3b1109cf82ce7dcb8e065d62f7f433ff48afbfa Michael Dvorkin mike@dvorkin.net