Karan Sharma
|
a8342b1c8a
|
frappe/upload.js: Fix undefined socketio object (#6308)
|
2018-10-30 11:05:16 +05:30 |
|
Karan Sharma
|
a4935e9ae4
|
frappe/chat.js: Fix check for momentjs (#6310)
|
2018-10-30 11:04:28 +05:30 |
|
Karan Sharma
|
943b66714d
|
Make user permission check as case-insensitive (#6313)
|
2018-10-30 11:02:22 +05:30 |
|
Sagar Vora
|
a8d6c0b2a7
|
feat(dropbox integration): add ability to delete older DB backups (#6332)
|
2018-10-30 10:47:35 +05:30 |
|
Ameya Shenoy
|
808835e7a1
|
Merge branch 'staging' into develop
|
2018-10-25 11:19:11 +00:00 |
|
Ameya Shenoy
|
4bf32f4ff2
|
Merge branch 'staging-fixes' into staging
|
2018-10-25 11:17:01 +00:00 |
|
Ameya Shenoy
|
0ac9fbd4f2
|
bumped to version 11.0.3-beta.15
|
2018-10-25 11:17:01 +00:00 |
|
Saurabh
|
d80fd366e7
|
Merge pull request #6183 from saurabh6790/subscription_support
provision to handle PayPal and Razoapay subscription charge notifications
|
2018-10-25 15:14:10 +05:30 |
|
Saurabh
|
0757c92713
|
[fix] razorpay subscription cancellation
|
2018-10-25 14:11:32 +05:30 |
|
Saurabh
|
7201f33eee
|
Add more keys to site config to support subscription
|
2018-10-25 14:11:32 +05:30 |
|
Saurabh
|
4f4706ae12
|
[fix] do not cache payment success page
|
2018-10-25 14:11:32 +05:30 |
|
Saurabh
|
dbe1e41775
|
[fix] pass form dict to validate function
|
2018-10-25 14:11:32 +05:30 |
|
Saurabh
|
fbc101db2d
|
[fix] change modified date
|
2018-10-25 14:11:32 +05:30 |
|
Saurabh
|
0d260be0aa
|
[fix] pass request type as Subscription Notification
|
2018-10-25 14:11:32 +05:30 |
|
Saurabh
|
3ce7ba4e5d
|
[fix] add validations on payment notification callback
|
2018-10-25 14:11:32 +05:30 |
|
Saurabh
|
32c5f7a011
|
provision to handel paypal and razoapay subscription charge notifications
|
2018-10-25 14:11:32 +05:30 |
|
Faris Ansari
|
3b0892017e
|
Merge pull request #6323 from netchampfaris/quill-assign-to-fix
Quill Assign To fix
|
2018-10-25 11:15:34 +05:30 |
|
Faris Ansari
|
a37c71945e
|
Merge pull request #6317 from netchampfaris/quill-assign-to-fix
Quill assign to fix
|
2018-10-25 10:52:15 +05:30 |
|
Faris Ansari
|
9e9e1f1902
|
fix(Assign To): Make dialog a property of AssignTo
|
2018-10-24 17:08:45 +05:30 |
|
Faris Ansari
|
fd2725bb2c
|
fix(Quill): Remove image drop module
Quill 2.0 already has it
|
2018-10-24 17:08:36 +05:30 |
|
Suraj Shetty
|
b1e0fc5ec9
|
Merge branch 'develop' of https://github.com/frappe/frappe into develop
|
2018-10-23 21:21:58 +05:30 |
|
Ameya Shenoy
|
42b4419b06
|
Merge branch 'staging' into develop
|
2018-10-23 12:55:31 +00:00 |
|
Ameya Shenoy
|
d4ed8f1028
|
Merge branch 'staging-fixes' into staging
|
2018-10-23 12:54:56 +00:00 |
|
Ameya Shenoy
|
9545d0fc62
|
bumped to version 11.0.3-beta.14
|
2018-10-23 12:54:56 +00:00 |
|
Ameya Shenoy
|
0279e957c6
|
Merge branch 'master' into staging-fixes
|
2018-10-23 12:51:30 +00:00 |
|
Ameya Shenoy
|
40787b326a
|
Merge branch 'hotfix'
|
2018-10-23 12:42:19 +00:00 |
|
Ameya Shenoy
|
5662d29476
|
bumped to version 10.1.56
|
2018-10-23 12:42:19 +00:00 |
|
Ameya Shenoy
|
127d469ee1
|
Merge pull request #6306 from codingCoffee/setup_wiz
fix: setup wizard
|
2018-10-23 18:09:02 +05:30 |
|
Ameya Shenoy
|
95c8b30d7d
|
Merge pull request #6281 from kennethsequeira/hotfix
Update in-app Docs Generation
|
2018-10-23 18:05:18 +05:30 |
|
Ameya Shenoy
|
854b09137c
|
fix: setup wizard
|
2018-10-23 12:10:13 +00:00 |
|
Suraj Shetty
|
1ac9494310
|
Merge branch 'develop' of https://github.com/frappe/frappe into develop
|
2018-10-23 15:44:07 +05:30 |
|
Faris Ansari
|
6e13fcf27f
|
Merge pull request #6303 from netchampfaris/route-event-emitter
fix(route): Fix event emitter on route
|
2018-10-23 15:14:48 +05:30 |
|
Faris Ansari
|
9436298560
|
fix(route): Fix event emitter on route
|
2018-10-23 15:12:38 +05:30 |
|
Ameya Shenoy
|
f7ab63e152
|
Merge pull request #6301 from codingCoffee/json
fix: commonify json.loads for filters
|
2018-10-23 13:39:33 +05:30 |
|
Ameya Shenoy
|
aa4ef1b405
|
Merge branch 'staging' into develop
|
2018-10-23 08:04:11 +00:00 |
|
Ameya Shenoy
|
a8f2798b82
|
Merge branch 'staging-fixes' into staging
|
2018-10-23 08:03:18 +00:00 |
|
Ameya Shenoy
|
1949c680ba
|
bumped to version 11.0.3-beta.13
|
2018-10-23 08:03:18 +00:00 |
|
Ameya Shenoy
|
f0f8851809
|
fix: commonify json.loads for filters
|
2018-10-23 13:20:05 +05:30 |
|
rohitwaghchaure
|
7085424a9d
|
Merge pull request #6298 from rohitwaghchaure/make_verbose_false
Set verbose to false
|
2018-10-23 12:00:57 +05:30 |
|
Rohit Waghchaure
|
63b2c14ec8
|
Set verbose to false
|
2018-10-23 11:59:18 +05:30 |
|
Saif
|
971e60f0bf
|
Added frappe.get_cached_doc in available jinja methods (#6292)
|
2018-10-23 11:04:18 +05:30 |
|
Himanshu Mishra
|
85d204a464
|
Primary key in tabSeries (#6285)
* add primary key on naming series
* remove unnecessary file
|
2018-10-23 11:03:57 +05:30 |
|
Frappe PR Bot
|
1826eb50eb
|
[Translation] Updated Translations (#6294)
|
2018-10-23 11:03:33 +05:30 |
|
Faris Ansari
|
a80fa7d939
|
Merge pull request #6295 from netchampfaris/quill-mention-local
fix(Quill): Use a local copy of quill-mention
|
2018-10-23 10:49:36 +05:30 |
|
Faris Ansari
|
fb075437da
|
Ignore eslint rules in quill mention
|
2018-10-23 10:25:52 +05:30 |
|
Suraj Shetty
|
80f107410b
|
Merge branch 'develop' of https://github.com/frappe/frappe into develop
|
2018-10-23 09:56:57 +05:30 |
|
Suraj Shetty
|
36483d8e0b
|
Social fixes (#6296)
* Fix image viewer
* Fix social home reload issue
* Set session user if unavailable
|
2018-10-23 09:53:38 +05:30 |
|
Suraj Shetty
|
f7fbc0fcdd
|
Set session user if unavailable
|
2018-10-23 09:51:19 +05:30 |
|
Suraj Shetty
|
fbed642ac8
|
Fix social home reload issue
|
2018-10-23 09:46:43 +05:30 |
|
Suraj Shetty
|
39e8dc66bb
|
Fix image viewer
|
2018-10-23 09:43:58 +05:30 |
|