vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
19625 commits 1 branch 0 tags 587 MiB
Commit graph

19625 commits

This branch
This branch
All branches
Author SHA1 Message Date
Suraj Shetty
7356820481 Merge branch 'develop' of https://github.com/frappe/frappe into minimizable-dialog 2019-05-22 14:56:34 +05:30
Rushabh Mehta
01dc6bee5b fix(delete_fields): handle commit for DDL separately for MariaDB and Postgres 2019-05-22 13:21:07 +05:30
Himanshu
2b14c95644 fix(Communication): New child doctype for Communication Timeline Links (#7524) 
* fix: separate child doctype for communication

* fix: reload doc before running the patches

* fix: update_timeline_doc

* fix: manipulatetimeline fields in Comm Links

* fix: test cases

* fix: reload comm_link before communication

* patch: remove redundant patch
 2019-05-21 20:48:55 +05:30
Prssanna Desai
6655e45273 fix: Increase font size in Module View (#7513) 2019-05-21 14:54:11 +05:30
Himanshu
0e7123d141 fix(Addresses and Contacts Report): Frappe throw when no record present (#7504) 2019-05-21 14:50:49 +05:30
Nabin Hait
d7527fab79 fix: Allow eligible fields to be updated from notifications (#7518) 2019-05-21 14:49:58 +05:30
Suraj Shetty
1fe6f7ceaa fix: Show "1 point" instead of "1 points" (#7489) 
* fix: Show "1 point" instead of "1 points"

* fix: Make text translatable

* fix: Format string twice to avoid duplicate code

- First formatting to add points text
- Second formatting to add variables aftter translation

* fix(energy point): Alert messages translation
 2019-05-21 13:18:51 +05:30
Rushabh Mehta
e919b90eac
Merge pull request #7525 from netchampfaris/perf-communication 
perf: Optimize get_communications
 2019-05-21 12:28:05 +05:30
Saurabh
0262f4e334
Merge pull request #7495 from cjpit/ldap3develop 
feat: ldap3 rewrite
 2019-05-21 12:19:34 +05:30
Faris Ansari
8fea62fcb9
Merge branch 'develop' into perf-communication 2019-05-21 12:05:49 +05:30
Faris Ansari
7d7b229438 perf: Optimize get_communications 
Split query with OR condition into two subqueries with UNION
 2019-05-21 12:03:58 +05:30
Rushabh Mehta
941d8076fd
Merge pull request #7521 from rmehta/fix-print-indenting 
fix(print): semantic nested lists for text editor
 2019-05-21 11:48:50 +05:30
Rushabh Mehta
105f9198c6 fix(patch): move_timeline_links_to_dynamic_link.py handle empty set 2019-05-21 11:25:13 +05:30
Himanshu
59c945bb84 fix(communication): Make optimizations to the patch 
* use batches to move Timeline and Links to Timeline Links doctype
 2019-05-21 00:00:57 +05:30
Rushabh Mehta
b8508de933
Merge pull request #7520 from ElasticRun/develop 
Fix related to Merge request #7228
 2019-05-20 19:09:55 +05:30
Rushabh Mehta
9c4e1eea5c fix(print): semantic nested lists for text editor 2019-05-20 18:58:32 +05:30
Sachin Mane
90c62d0c99 .get() does not work in JavaScript. 2019-05-20 18:55:33 +05:30
Sachin Mane
b1c63dbe95 Merge branch 'develop' of https://github.com/frappe/frappe into develop 2019-05-20 18:51:39 +05:30
Rushabh Mehta
28ed21b94c
Merge pull request #7419 from josejibin/fix/postgres-compatible 
fix(postgres): Make db queries postgres compatible
 2019-05-20 18:02:30 +05:30
Rushabh Mehta
91ce69b58b
Merge pull request #7228 from ElasticRun/develop 
feat: Add frappe cmd and doctype to request headers for analytics and load balancing
 2019-05-20 17:59:38 +05:30
Faris Ansari
cf8a53e433
feat(Communication): Move Timeline DocType and Name to Dynamic Links (#7467) 
feat(Communication): Move Timeline DocType and Name to Dynamic Links
 2019-05-20 15:12:32 +05:30
Suraj Shetty
93daaddc10 feat: Add minimize modal feature 2019-05-20 14:49:50 +05:30
Himanshu Warekar
4946c1559f Merge develop in comm_ref 2019-05-20 14:40:59 +05:30
Himanshu Warekar
81d314bf10 fix: typo fixes 2019-05-20 14:40:20 +05:30
Himanshu Warekar
b4e561c047 tests: fix test cases 2019-05-20 14:15:57 +05:30
Himanshu Warekar
c86ba03632 tests: fix test cases 2019-05-20 13:38:01 +05:30
Himanshu Warekar
127cf29a20 tests: added new test cases 2019-05-20 13:04:16 +05:30
jibin jose
480f1794d3 Make db query postgres compatible 2019-05-20 12:31:30 +05:30
jibin jose
1a58c13966 fix(postgres): Make db queries postgres compatible 2019-05-20 12:31:30 +05:30
Deepesh Garg
a873340d4e fix: Create new button for dynamic links (#7511) 
* fix: Create new button for dynamic links

* fix: Use get_options for fetching options
 2019-05-20 12:19:42 +05:30
Suraj Shetty
78da23a7a1
Merge pull request #7516 from deepeshgarg007/moduleview_develop 
fix: Module view fix for custom query reports
 2019-05-20 10:25:11 +05:30
deepeshgarg007
ba7af52caa fix: Module view fix for custom reports 2019-05-19 17:56:41 +05:30
Rushabh Mehta
5865eb1538
Merge pull request #7507 from prssanna/link-preview-fixes 
fix(Link Preview): Allow popover to be hovered on and other fixes
 2019-05-19 09:31:38 +05:30
Himanshu Warekar
05b3050b63 patch: batch 10000 query for patch 2019-05-19 00:39:11 +05:30
Himanshu Warekar
c52c1611cb patch: optimisations 2019-05-18 19:17:00 +05:30
Himanshu Warekar
6403cf45ae patch: optimisations 2019-05-18 18:54:47 +05:30
Faris Ansari
6c3130dc77
fix: Allow variables to be overridden using theme (#7514) 2019-05-18 16:42:56 +05:30
Himanshu Warekar
defe1b2eef fix: miscellaneous changes 2019-05-18 13:37:00 +05:30
Prssanna Desai
d6d0bc1cb3 Allow popover to be hovered on and other fixes 2019-05-18 12:48:53 +05:30
Himanshu Warekar
0050fb58ff fix: remove clear reference links from delete doc 2019-05-18 10:40:55 +05:30
Himanshu Warekar
9f02f4284d patch: optimisations 2019-05-18 00:35:17 +05:30
Himanshu Warekar
dbd0a79ffc patch: move timeline and link to dynamic links 2019-05-17 14:26:53 +05:30
Himanshu Warekar
08fb052334 fix: rename dynamic links to timeline links 2019-05-17 14:21:37 +05:30
Himanshu Warekar
447019b947 Merge develop into comm_ref 2019-05-17 00:25:24 +05:30
Himanshu Warekar
0d9b7048d9 fix: tests for communication 2019-05-17 00:06:38 +05:30
Himanshu Warekar
aa98dd28a6 test: communication tests 2019-05-16 20:04:49 +05:30
Rushabh Mehta
e03539703c
Merge pull request #7502 from rmehta/link-preview-fixes 
fix(link-preview): show preview only if setup and cleanup style
 2019-05-16 19:32:55 +05:30
Rushabh Mehta
c89185aed8 fix(minor): comments.py 2019-05-16 18:45:41 +05:30
Himanshu Warekar
43bc6ca8d1 fix: missing quotes in where clause 2019-05-16 18:36:10 +05:30
Rushabh Mehta
29c0d6f16a fix(minor): comments.py 2019-05-16 17:58:27 +05:30