Commit graph

21308 commits

Author SHA1 Message Date
Rohan Bansal
d768763da4 test: fix tests 2019-08-28 16:55:10 +05:30
Rohan Bansal
ef31f44a0b test: add tests for webhook additions 2019-08-27 16:27:22 +05:30
Rohan Bansal
2e86ed58ec feat: allow forming JSON requests in webhook 2019-08-26 15:09:17 +05:30
mergify[bot]
5f389b8db1
Merge pull request #8249 from hrwX/gs_dashboard
fix(Integrations): UX fixes for google integrations
2019-08-24 06:51:12 +00:00
Shivam Mishra
535c349f9a
Merge pull request #8097 from prssanna/user-profile
feat(User Profile): New User Profile Pages with Energy Points Insights
2019-08-24 10:51:31 +05:30
Himanshu
eb9b034c2b
Update frappe/integrations/doctype/google_settings/google_settings.js
Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2019-08-23 15:34:01 +05:30
Himanshu
b320318878
Update frappe/integrations/doctype/google_contacts/google_contacts.js
Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2019-08-23 15:33:54 +05:30
mergify[bot]
4fe992bcb6
Merge pull request #8217 from netchampfaris/activity-feed-null-bug
fix: Activity Feed
2019-08-23 09:23:06 +00:00
sahil28297
266aa83741
Merge pull request #8227 from scmmishra/sidebar-toggle
feat: allow toggle sidebar to be persistent using local storage
2019-08-23 13:59:07 +05:30
Faris Ansari
f89d842d00 fix: Remove declaration 2019-08-23 13:56:05 +05:30
Himanshu Warekar
43ce576e49 chore: rename drive to contacts 2019-08-23 13:54:43 +05:30
Himanshu Warekar
a8ff36ec0b fix: ux fixes for google integrations 2019-08-23 13:51:29 +05:30
Faris Ansari
87987a0dde fix: Use single quotes for Postgres
Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2019-08-23 13:44:06 +05:30
mergify[bot]
05f8a8da46
Merge pull request #8246 from prssanna/notifications-fix
fix: fix energy point notifications date range
2019-08-23 06:57:44 +00:00
prssanna
876c4aa4db fix: fix string translation and rename function 2019-08-23 12:15:05 +05:30
rohitwaghchaure
5c7d1fd1ae
Merge pull request #8182 from rohitwaghchaure/fix_using_custom_script_barcode_not_working
fix: using custom script barcode is not generated
2019-08-23 11:48:07 +05:30
mergify[bot]
57dd1757ef
Merge pull request #8203 from prssanna/created-by
feat: Add 'Created By' to default sidebar filters
2019-08-23 05:53:40 +00:00
mergify[bot]
3b104f593d
Merge pull request #8242 from netchampfaris/website-theme-font-awesome
fix: Include font-awesome in website.scss
2019-08-23 04:56:37 +00:00
mergify[bot]
7a1da3a9bd
Merge pull request #8245 from scmmishra/webform-payment-redirect
fix: redirect after payment
2019-08-22 17:18:41 +00:00
prssanna
21c55b0659 fix: fix energy point notifications date range 2019-08-22 20:14:37 +05:30
Shivam Mishra
ec5917a682 fix: redirect after payment 2019-08-22 19:21:12 +05:30
Faris Ansari
ea0737fc06 fix: Include font-awesome in website.scss 2019-08-22 17:36:36 +05:30
mergify[bot]
1de4dd9cb2
Merge pull request #8236 from hrwX/xss_ignore_webpage
fix(Webpage): ignore xss for html field
2019-08-22 08:06:11 +00:00
Sahil Khan
175818675d Merge branch 'develop' into version-12 2019-08-22 13:08:23 +05:30
Sahil Khan
c3a9449f92 bumped to version 12.0.8 2019-08-22 13:28:23 +05:50
Himanshu Warekar
e98a42780d fix: ignore xss for html field 2019-08-22 13:07:50 +05:30
Shivam Mishra
ac1f2d81c9 style: linitng fixes 2019-08-22 12:36:53 +05:30
Shivam Mishra
ca6eae5794 feat: added sidebar visibility class to body for consistent layout across pages 2019-08-22 12:35:38 +05:30
prssanna
7491500142 fix: add init.py and refactor get_user_rank function 2019-08-22 12:14:14 +05:30
rohitwaghchaure
684d3887ab
Merge pull request #8235 from rohitwaghchaure/unknown_column_seen_in_database
fix: Unknown column seen in field list
2019-08-22 12:13:15 +05:30
Rohit Waghchaure
06c8503142 fix: Unknow column seen in field list 2019-08-22 12:11:46 +05:30
mergify[bot]
807e39efe1
Merge pull request #8234 from hrwX/misc_fixes
chore: codacy fixes
2019-08-22 06:27:20 +00:00
Himanshu Warekar
37565bfefa chore: codacy fixes 2019-08-22 10:11:25 +05:30
mergify[bot]
596f80a7f9
Merge pull request #8157 from hrwX/gdrive
feat(Google Drive): Google Drive
2019-08-21 18:29:56 +00:00
Himanshu Warekar
2ba5f6e0ac fix: remove unnecessary check 2019-08-21 23:20:40 +05:30
Himanshu Warekar
6ae434c937 fix: codacy 2019-08-21 21:50:40 +05:30
Himanshu Warekar
2373014e11 fix: codacy 2019-08-21 21:32:16 +05:30
Shivam Mishra
8f733173e2 refactor: fixed sidebar visibility after refresh 2019-08-21 19:42:38 +05:30
Shivam Mishra
d448b1fd25 feat: allow toggle sidebar to be persistent using local storage
Co-authored-by: Sahil Khan <sahilkhan28297@gmail.com>
2019-08-21 19:27:08 +05:30
Himanshu Warekar
b4084de9ab fix: create folder if not exists 2019-08-21 19:04:38 +05:30
Himanshu Warekar
8e578d3b0f fix: find folder if already exists 2019-08-21 18:22:29 +05:30
Himanshu Warekar
38e2fad23a fix: do not show take backup if not enable 2019-08-21 17:57:12 +05:30
Himanshu Warekar
c33317ccf8 fix: reset folder id on reauthorize 2019-08-21 17:45:54 +05:30
Himanshu Warekar
1abf318b49 fix: import enqueue 2019-08-21 17:40:38 +05:30
Himanshu Warekar
9b70c01e87 fix: queue google drive backup 2019-08-21 17:37:48 +05:30
Himanshu Warekar
7aa975a98f fix: upload gz files 2019-08-21 17:23:09 +05:30
Himanshu Warekar
951cb5459b fix: dashboard headline 2019-08-21 16:54:17 +05:30
Himanshu Warekar
bb1c1c150c fix: reset auth refresh token when email change 2019-08-21 16:44:43 +05:30
Prssanna Desai
1fb0f9df89 fix: PyYAML version in requirements (#8219) 2019-08-21 14:27:34 +05:30
mergify[bot]
3bdb4313ef
Merge pull request #8188 from surajshetty3416/enhance-energy-point-system
feat(eps): Add ability to make point rule for document creation
2019-08-21 08:38:20 +00:00