Commit graph

12643 commits

Author SHA1 Message Date
Faris Ansari
2ff26d7798 Update eslint 2017-06-02 15:00:14 +05:30
Faris Ansari
b99fd5a4d3 Fixed tab spacing 2017-06-02 15:00:14 +05:30
Faris Ansari
d9f3b57bb8 Add eslint files 2017-06-02 15:00:14 +05:30
Faris Ansari
2a3b34822b Remove all implicit global variables 2017-06-02 15:00:14 +05:30
Nabin Hait
96c8d959af Merge branch 'master' into develop 2017-06-02 14:46:13 +05:30
Nabin Hait
f1dc09fa3a Merge branch 'hotfix' 2017-06-02 14:46:13 +05:30
Nabin Hait
b23d25275e bumped to version 8.0.64 2017-06-02 15:16:12 +06:00
Prateeksha Singh
fe9fdcb23a [hotfix] Password strength fix (#3420)
* [fix] password min-score loophole

* [minor] cleanup message

* [fix] test
2017-06-02 14:45:41 +05:30
Nabin Hait
273c94fe4b Merge branch 'master' into develop 2017-06-02 14:05:35 +05:30
Nabin Hait
1b10107bd8 Merge branch 'hotfix' 2017-06-02 14:05:34 +05:30
Nabin Hait
6d9dc4a0c1 bumped to version 8.0.63 2017-06-02 14:35:34 +06:00
Makarand Bauskar
71d1e8c0e0 [minor] select the Inbox in readonly false mode while pulling emails (#3412) 2017-06-02 14:03:21 +05:30
Nabin Hait
37cd69b4df Clear email query via separate query to avoid deadlock (#3418) 2017-06-02 14:03:11 +05:30
Prateeksha Singh
a6725a7650 Password strength fix (#3419)
* [fix] password min-score loophole

* [minor] cleanup message
2017-06-02 13:59:33 +05:30
Nabin Hait
8d29df6ddd Merge branch 'master' into develop 2017-06-01 19:09:32 +05:30
Nabin Hait
0699ea100f Merge branch 'hotfix' 2017-06-01 19:09:31 +05:30
Nabin Hait
a101f0fa04 bumped to version 8.0.62 2017-06-01 19:39:31 +06:00
Frappe PR Bot
ef941bf538 [translation] translation updates (#3409) 2017-06-01 19:04:45 +05:30
rohitwaghchaure
dc455a3c24 Row with label like Opening not displaying in the General Ledger report if user has set user permissions (#3414) 2017-06-01 19:02:01 +05:30
Makarand Bauskar
50bfc3b353 [travis] Install node v7 (#3417) 2017-06-01 19:00:49 +05:30
Dhaifallah Alwadani
3180b88d01 Fix fav button margin in RTL (#3393) 2017-06-01 16:38:23 +05:30
Makarand Bauskar
f6a9ede30c Merge pull request #3413 from netchampfaris/bootstrap-theme
Cascade bootstrap css instead of replacing
2017-06-01 16:23:49 +05:30
ahmadRagheb
dd209510ba [minor] changed the message field property reqd to 1 in Feedback Trigger (#3416) 2017-06-01 14:54:43 +05:30
Makarand Bauskar
789de48faf Merge pull request #3385 from Ramesh7128/patch-2
Update hooks.md
2017-06-01 13:25:39 +05:30
Makarand Bauskar
27a69e332f Merge pull request #3383 from almeidapaulopt/translation_email
translations on communications.js
2017-06-01 13:23:14 +05:30
Makarand Bauskar
7930f14572 Merge pull request #3415 from netchampfaris/travis-node
[travis] Install node v7
2017-06-01 13:04:57 +05:30
Faris Ansari
feb275b2f4 [travis] Install node v7 2017-06-01 12:39:21 +05:30
Faris Ansari
760bfc1260 Cascade bootstrap css instead of replacing 2017-05-31 15:26:36 +05:30
Nabin Hait
1b6a0e1dea Merge branch 'hotfix' 2017-05-30 15:58:59 +05:30
Nabin Hait
bc2ac5db75 Merge branch 'master' into develop 2017-05-30 15:58:59 +05:30
Nabin Hait
b0f2da7e26 bumped to version 8.0.61 2017-05-30 16:28:59 +06:00
Nabin Hait
36d45fb709 Report and Page is editable for Admin (#3410) 2017-05-30 15:23:49 +05:30
Nabin Hait
8890165fa3 Multiple issues fixed in auto email report (#3394) 2017-05-30 15:22:25 +05:30
Manas Solanki
ecfd190044 Error handling if visible_index not found in query report (#3399) 2017-05-30 15:21:50 +05:30
Faris Ansari
4f80f7633f Fix wrong precision shown in form (#3400) 2017-05-30 15:21:29 +05:30
Makarand Bauskar
9503ae655b [minor] changed the yahoo smtp port from 465 to 587 (#3402) 2017-05-30 15:21:15 +05:30
ahmadRagheb
72f0b6cc79 Fix "Print Format Builder" translation (#3403)
* First commit

* fix  "Print Format Builder" label to be translated
2017-05-30 15:20:53 +05:30
tundebabzy
b1936b8fc7 Issue with ToDo WYSIWG area (#3374) (fixes frappe/erpnext#7773)
* fixes #7773: Issue with ToDo WYSIWG area
2017-05-29 17:21:44 +05:30
Ayush Shukla
3b88792815 Replaced spaces with underscore in filename (#3386) 2017-05-29 17:11:28 +05:30
almeidapaulopt
6dcfd8fdb3 Gantt milestones (#3370) 2017-05-29 10:59:49 +05:30
Nabin Hait
5e99c3ec9b Merge branch 'hotfix' 2017-05-26 21:36:17 +05:30
Nabin Hait
aa16e8adf5 Merge branch 'master' into develop 2017-05-26 21:36:17 +05:30
Nabin Hait
6829dadbda bumped to version 8.0.60 2017-05-26 22:06:16 +06:00
Makarand Bauskar
9149fbc5df [minor] fixes for default print format appears twice (#3392) 2017-05-26 12:44:38 +05:30
Makarand Bauskar
edeee39122 [minor] fixed pdf export issue for the reports (#3391) 2017-05-26 11:06:51 +05:30
Prateeksha Singh
a124734860 [fix] remove redundant progress modal frappe/erpnext#8993 (#3389) 2017-05-25 15:47:30 +05:30
Ramesh
67cff23db2 Update hooks.md
added additional hooks in hook.md. on_trash, on_change and after_delete.
2017-05-25 13:07:36 +05:30
Paulo Almeida
628dc2512e translations on communications.js 2017-05-24 17:34:49 +01:00
Nabin Hait
728a94ba3c Changed modified timestamp for system_settings 2017-05-24 18:40:58 +05:30
Nabin Hait
fd9108a7b3 Merge branch 'master' into develop 2017-05-24 18:37:45 +05:30