Commit graph

377 commits

Author SHA1 Message Date
Saurabh
205ae26751 [fix] refactor integration services (#2087)
* [fix] refactor integration services

* [fix] patch fix

* [fix] added redirect url.

* [fix] custom redirect to and reditect message for paypal and service setup information

* [minor][fix] remove ldap dependancy from requirements
2016-10-10 17:16:21 +05:30
Rushabh Mehta
bae97cfed4 Email Alert on any controller method (#2157)
* [docs] typo

* [email alert] now on any standard controller method

* [minor] install customizations with intall;

* [test] [fix] and truncate subject in email;

* [fix] error log seen issue
2016-10-08 11:11:36 +05:30
Rushabh Mehta
9d7ee83c5e [refactor] scheduler log is now error log and as MyISAM (commit not required) (#2152)
* [refactor] scheduler log is now error log

* [minor] new naming series

* [fix] engine

* [fix] saved by tests
2016-10-06 17:17:55 +05:30
Makarand Bauskar
dc30e57b60 [minor] removed the desktop_backgroud from frappe hooks (#2085) 2016-09-26 18:15:47 +05:30
Shreyas Patil
12422e75b0 [Minor] Allow user to set limit for downloadable backups for the site (#2059)
* [Minor] Allow user to set limit for downloadable backups for the site

* [Fix] Updated path for daily_long and weekly_long dropbox backup hooks

* [Fix] Updated system_settings.json
2016-09-21 11:10:41 +05:30
Makarand Bauskar
ac616e1e3e [minor] spelling fixes (#2066) 2016-09-19 13:09:03 +05:30
Saurabh
18c62f0470 Integration broker (#1968)
* [enhancement] integration borker and controller

* [minor][fix] parameter naming changes

* [fix] common scheduler for integration service

* [fix] integrations

* [patch] patch to move payment gateway in Integration Service

* [fix] add payment success, cancel and failuer handling pages

* [enhancment] dropbox integration merged in integration services

* provision to add custom parameters

* [fixes] patch fix to setup dropbox settings

* [fixes] removed dropbox backup, api usage note for paypal and razorpay

* [minor][fix] deprecate service events

* [fix] return type fix for checkout urls

* [fix] add custom settings via patch for dropbox backup frequency

* [fix] remove gride editting

* [enhance] ldap based login

* [enhance] login via ldap credentails

* [commit] remove parameter table, save params as json dict
2016-09-09 11:15:18 +05:30
Rushabh Mehta
303e7460c2 [feature] [wip] added Auto Email Report 2016-09-01 17:52:33 +05:30
Rushabh Mehta
7ef8f5f7a2 [minor] fixes to patches, ignore validate if in patch, move some events to hourly 2016-08-16 10:24:09 +05:30
Rushabh Mehta
07bdc7b111 [fix] enable website_theme 2016-08-03 11:49:18 +05:30
Valmik Jangla
4bdf8fab62 Email Group fixes 2016-07-12 23:37:43 -07:00
Kanchan Chauhan
a23ee192f3 Newsletter moved to Frappe 2016-06-28 18:28:24 +05:30
Anand Doshi
3854bcad04 [fix] limits variables and how usage is stored within limits + additional fixes 2016-06-25 17:41:19 +05:30
Rushabh Mehta
461adc7c37 [fix] more rename from bulk to email queue 2016-06-22 13:19:58 +05:30
Rushabh Mehta
da95b484db [fix] merge fixes and test 2016-06-22 13:10:23 +05:30
Rushabh Mehta
8a91f1a790 [rename] Bulk Email to Email Queue 2016-06-22 13:06:06 +05:30
Valmik Jangla
0687eb145d Added misc Frappe Subscription features 2016-06-22 12:37:33 +05:30
Anand Doshi
8df1c36a17 Merge pull request #1784 from vjFaLk/frappe-limits
[WIP] Move Frappe subscription features to Frappe App as Limits
2016-06-13 12:21:20 +05:30
shreyas
9511e14353 Move Frappe subscription features to Frappe App as Limits 2016-06-10 16:34:53 +05:30
Anand Doshi
0c551d6382 [fix] change in versioning: store __version__ in __init__.py 2016-06-09 16:08:59 +05:30
Nabin Hait
78f6282925 Merge branch 'master' into develop 2016-06-03 11:49:00 +05:30
Nabin Hait
6704fef89d bumped to version 6.27.21 2016-06-03 12:19:00 +06:00
Rushabh Mehta
1e9bdec22d [minor] separted js files into smaller chunks 2016-06-02 16:24:27 +05:30
Rushabh Mehta
74919b99a0 [enhancement] remember list settings - sort, filters, paging 2016-05-30 18:19:47 +05:30
Nabin Hait
caa608fafa Merge branch 'master' into develop 2016-05-26 15:41:49 +05:30
Nabin Hait
f5d1fd3bea bumped to version 6.27.20 2016-05-26 16:11:49 +06:00
Nabin Hait
0130d721c1 Merge branch 'master' into develop 2016-05-20 12:16:59 +05:30
Nabin Hait
2e88c23fd4 bumped to version 6.27.19 2016-05-20 12:46:59 +06:00
Nabin Hait
0a20b1e27e Merge branch 'master' into develop 2016-05-11 12:41:34 +05:30
Nabin Hait
786d2598a0 bumped to version 6.27.18 2016-05-11 13:11:34 +06:00
Nabin Hait
3825cd50a9 Merge branch 'master' into develop 2016-05-06 16:11:54 +05:30
Nabin Hait
85f87f3748 bumped to version 6.27.17 2016-05-06 16:41:54 +06:00
Anand Doshi
c72cb70393 Merge branch 'master' into develop 2016-04-28 16:43:57 +05:30
Anand Doshi
3a091a3ef3 bumped to version 6.27.16 2016-04-28 17:13:57 +06:00
Anand Doshi
a7adc7da54 Merge branch 'master' into develop 2016-04-27 15:41:34 +05:30
Anand Doshi
8d1ace1ccc bumped to version 6.27.15 2016-04-27 16:09:44 +06:00
Anand Doshi
006d289b98 Merge branch 'master' into develop 2016-04-22 12:47:42 +05:30
Anand Doshi
01aa272db6 bumped to version 6.27.14 2016-04-22 13:17:41 +06:00
Rushabh Mehta
e9847476d1 [cleanup] [web] styles 2016-04-21 13:10:33 +05:30
Anand Doshi
f025f1540f Merge branch 'master' into develop 2016-04-20 20:12:35 +05:30
Anand Doshi
9f66e0faaf bumped to version 6.27.13 2016-04-20 20:42:34 +06:00
Anand Doshi
a6243744d3 Merge branch 'master' into develop 2016-04-20 19:40:20 +05:30
Anand Doshi
ded3c11f76 bumped to version 6.27.12 2016-04-20 20:10:20 +06:00
Anand Doshi
4bf0e8fce7 Merge branch 'master' into develop 2016-04-20 16:30:31 +05:30
Anand Doshi
92b4fdcf88 bumped to version 6.27.11 2016-04-20 16:41:01 +06:00
Nabin Hait
5e6780923c Merge branch 'master' into develop 2016-04-15 11:07:43 +05:30
Nabin Hait
98a06e1276 bumped to version 6.27.10 2016-04-15 11:30:38 +06:00
Nabin Hait
9273935979 Merge branch 'master' into develop 2016-04-14 18:10:03 +05:30
Nabin Hait
6d2a5853ed bumped to version 6.27.9 2016-04-13 16:32:58 +06:00
Anand Doshi
7132935fef Merge branch 'master' into develop 2016-04-07 17:39:51 +05:30