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

19655 commits

This branch
This branch
All branches
Author SHA1 Message Date
Rushabh Mehta
9f5a632baf fix(linting) 2019-05-24 09:08:56 +05:30
Rushabh Mehta
81fa64d4bc refactor(form.js): remove very old API 2019-05-24 09:08:56 +05:30
Rushabh Mehta
83eb9c3acc refactor(form.js): wip 2019-05-24 09:08:56 +05:30
Rushabh Mehta
bedaa5453f refactor(form.js): the time has come 2019-05-24 09:08:20 +05:30
Anurag Mishra
dacdd3fdb5 fix: Bulk user permission unhandled condition(v12) (#7401) 
* fix: unhandled condition

* test: for update from apply_to_all to apply_to_all

* fix: refractor

* Update test_user_permission.py
 2019-05-24 08:36:41 +05:30
Rushabh Mehta
8e9336b476
Merge pull request #7545 from deepeshgarg007/datatable 
fix: Update frappe datatable
 2019-05-23 17:33:38 +05:30
Rushabh Mehta
fa814824f8
Merge pull request #7501 from netchampfaris/form-attachments 
fix: Upload form attachments to Attachments folder
 2019-05-23 17:32:55 +05:30
Faris Ansari
99c624bd9c
Merge branch 'develop' into form-attachments 2019-05-23 15:21:11 +05:30
deepeshgarg007
6b4c24fda6 Merge branch 'develop' of https://github.com/frappe/frappe into datatable 2019-05-23 15:16:56 +05:30
deepeshgarg007
7d49df12ce fix: Update frappe datatable 2019-05-23 15:16:29 +05:30
Rushabh Mehta
e944ba5ad1
Merge pull request #7274 from ci2014/patch-27 
Expose Recipients in Notifications
 2019-05-23 15:15:53 +05:30
Suraj Shetty
9883b1f751
Merge pull request #7541 from frappe/fix-has-perm 
fix: has permission decorator
 2019-05-23 15:11:10 +05:30
Rushabh Mehta
7cb648eb5b
Merge pull request #7453 from rmehta/remove-autodoc 
refactor: remove autodocs, no longer used
 2019-05-23 15:09:23 +05:30
Rushabh Mehta
64a672973d
Merge pull request #7445 from Alchez/develop-msgprint-primary-action 
feat(core): Allow action on msgprint and throw calls
 2019-05-23 15:01:50 +05:30
Rushabh Mehta
84201b9d3b
Merge pull request #7300 from rohitwaghchaure/feat_force_user_to_reset_password_develop 
feat: force user to reset password after x days
 2019-05-23 15:00:31 +05:30
Faris Ansari
32e066988a
fix(patch): Move files only from Home folder 2019-05-23 14:55:48 +05:30
Rushabh Mehta
2a4095dbe7
Merge pull request #7385 from netchampfaris/fix-set-lang-print-d 
fix: Set user language in print preview
 2019-05-23 14:50:55 +05:30
Mangesh-Khairnar
cc0ea13ec5
fix: has permission decorator 2019-05-23 13:04:59 +05:30
Himanshu
3bd1e22865 patch: rearange order for reload_doc (#7540) 2019-05-23 09:37:25 +05:30
Himanshu
51042b1359 fix(load): alias creation in get communications (#7538) 
* fix: alias creation

* fix: fix update_timeline_doc

* fix: add timeline link irrespective of comm medium
 2019-05-23 09:35:53 +05:30
Anurag Mishra
2ffc939fb5
fix: Doctype some tests and fix (#7536) 
* test: some tests and fix

* Update test_doctype.py
 2019-05-22 18:11:45 +05:30
Mangesh-Khairnar
1387c331bc fix: print format builder setup (#7531) 2019-05-22 15:04:42 +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
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