Commit graph

14692 commits

Author SHA1 Message Date
crossxcell99
51858021c8 refactor code fix bug 2017-07-19 14:29:30 +01:00
Rushabh Mehta
5577442251 [tests] refactor tests (#3743)
* [tests] refactored client side tests

* [tests] refactored client side tests

* [tests] refactored client side tests
2017-07-19 18:09:06 +05:30
Faris Ansari
db22aa1c87 Email styling using email.less (#3704)
* DRY font-family declarations

* Add email.less, inline styles using premailer

* min-width 100% for mobile email clients

* Emails without header have default 100% width (like before)

* Include email.css for all apps

* Keep !important declarations

* Add test case for inlining css

* Ignore important rules in css

* minor
2017-07-19 16:21:06 +05:30
Mainul Islam
4f7feddb6a [Print format] Translate section headings, hide sections with no data (#3697)
* Section label set as translatable

* Show section title if hase data in section other
2017-07-19 15:56:41 +05:30
Makarand Bauskar
3ae5baad2e [minor] added empty line after country fixture installation (#3740) 2017-07-19 15:52:39 +05:30
Rushabh Mehta
ff52a61e03 [minor] link filters should be selectable (#3736)
* [minor] link filters should be selectable

* [test] add timeout
2017-07-19 15:52:16 +05:30
Prateeksha Singh
d230021134 [notif] fix alignment (#3734) 2017-07-19 14:50:43 +05:30
Faris Ansari
5ed241d81a Multiple filter area fix (#3738) 2017-07-19 13:49:23 +05:30
rohitwaghchaure
8c8385a37b [Fix] Calender view broken if filters has not applied (#3737) 2017-07-19 12:32:55 +05:30
Narciso E. Núñez Arias
e081dff979 Translation of the Tutorial And Videos section to Spanish (#3718)
* Add basic files structure for spanish translation of the doc

* Translate the video tutorial index page

* Translate Before Start page

* Translate What is an app page

* Translate the Bench page

* Translate Conslusion page of the tutorial

* Translate to spanish Tutorial Index page

* Translate to spanish Reports page

* Translate to Spanish Roles Page

* Translate to Spanish the Tutorial Model Page

* Translate to Spanish the tutorial Single Doctypes page

* Translate to Spanish the tutorial Doctype files structure page

* Translate to Spanish the tutorial Start Bench page

* Translate to Spanish the tutorial New App page

* Translate to Spanish the tutorial Client Side Script page

* Translate to Spanish the tutorial Users and records page

* Translate to Spanish the tutorial Setting Up the site page

* Translate to Spanish the tutorial Task Runner page

* Translate to Spanish the tutorial Controllers Page

* Translate to Spanish the tutorial Doctypes page

* Translate to Spanish the tutorial Naming And Linking page

* Translate to Spanish the tutorial Web Views page
2017-07-19 10:29:16 +05:30
Rushabh Mehta
d4ba711178 Fixing tests (#3735)
* [check] test_calendar_view.js

* [check] test_calendar_view.js

* [tests] run all together

* [tests] run all together

* [tests] that work
2017-07-19 10:21:55 +05:30
crossxcell99
b348027a17 Merge branch 'twofactor' of https://github.com/manqala/frappe into twofactor 2017-07-18 19:04:49 +01:00
crossxcell99
99700fb198 check if more than one role has 2fa enabled 2017-07-18 19:03:45 +01:00
Rushabh Mehta
2bd3d1e2ce [minor] no controller_list.js in doctype boilerplate 2017-07-18 22:44:59 +05:30
Rushabh Mehta
124c069819 [fix] formatters 2017-07-18 22:09:33 +05:30
B H Boma
cde8001369 Show twofactor auth in setup wizard 2017-07-18 17:30:11 +01:00
Saurabh
c4aa821b51 Merge branch 'hotfix' 2017-07-18 21:45:59 +05:30
Saurabh
d662f92851 Merge branch 'master' into develop 2017-07-18 21:45:59 +05:30
Saurabh
e50ade324f bumped to version 8.5.5 2017-07-18 22:15:58 +06:00
Saurabh
a21ca34db7 Merge pull request #3732 from saurabh6790/formater_fix
[hot][fix] check if option exists
2017-07-18 21:44:58 +05:30
Saurabh
bed7460616 [hot][fix] check if option exists 2017-07-18 21:39:56 +05:30
crossxcell99
f34d52fb65 Minor fix for checking successful otp login 2017-07-18 17:05:24 +01:00
mbauskar
a2e8b5cd85 Merge branch 'master' into develop 2017-07-18 19:01:00 +05:30
mbauskar
d6e7aa5613 Merge branch 'hotfix' 2017-07-18 19:00:59 +05:30
mbauskar
194352b167 bumped to version 8.5.4 2017-07-18 19:30:59 +06:00
Rushabh Mehta
a99b49be96 [fix] filter formatting (#3729) 2017-07-18 19:00:22 +05:30
Rushabh Mehta
9f97ce568a [tests] allow test anywhere in app and add boilderplate _test_controller.js (#3724)
* [tests] allow test anywhere in app and add boilderplate _test_controller.js

* [fix] test_number_format.js

* [minor] dont run test_runner.js

* [test] _test_module_menu.js

* [test] why is browser crashing?
2017-07-18 18:01:54 +05:30
mbauskar
0c14957172 Merge branch 'hotfix' 2017-07-18 17:52:00 +05:30
mbauskar
dde4a1fbf6 Merge branch 'master' into develop 2017-07-18 17:52:00 +05:30
mbauskar
4ee880a55b bumped to version 8.5.3 2017-07-18 18:21:59 +06:00
Manas Solanki
bd4d0e45ca fix error in email queue (#3728) 2017-07-18 17:51:26 +05:30
mbauskar
f02145f63f Merge branch 'hotfix' 2017-07-18 16:37:50 +05:30
mbauskar
8e5608b32a Merge branch 'master' into develop 2017-07-18 16:37:50 +05:30
mbauskar
c512cd4718 bumped to version 8.5.2 2017-07-18 17:07:49 +06:00
rohitwaghchaure
019619958a [Fix] Unable to open calendar view of the task (#3727) 2017-07-18 16:37:09 +05:30
mbauskar
d53b87e39d Merge branch 'hotfix' 2017-07-18 15:25:22 +05:30
mbauskar
ca95a3fca7 Merge branch 'master' into develop 2017-07-18 15:25:22 +05:30
mbauskar
8d808253b3 bumped to version 8.5.1 2017-07-18 15:55:22 +06:00
Rushabh Mehta
8f88f68213 [fix] btn_enable_disable (#3725) 2017-07-18 15:24:00 +05:30
B H Boma
4b84a1a572 [fix] Qrcode not visible for twofactor auth 2017-07-18 10:39:44 +01:00
Utkarsh Yadav
7be8b20a14 [UI Test] Module view (#3707)
* [UI Test] Module view

* changed file names

* minor changes
2017-07-18 14:43:55 +05:30
Rushabh Mehta
ac55a8626e [minor] added timeout while setting values 2017-07-18 14:38:51 +05:30
mbauskar
91e705e37a Merge branch 'develop' 2017-07-18 12:36:46 +05:30
mbauskar
91d9bb50ff bumped to version 8.5.0 2017-07-18 13:06:46 +06:00
Makarand Bauskar
9daa7b3751 [domainify] hide restrict to domain modules from modules page (#3677)
* [domainify] hide restrict to domain modules from modules page

* [minor] cleared the domainification cache and other minor fixes

* Update test_domainification.py
2017-07-18 12:29:57 +05:30
Prateeksha Singh
a19c7e61e5 [minor] long tags, fixes frappe/erpnext#9770 (#3716) 2017-07-18 12:16:45 +05:30
Makarand Bauskar
7aa013011e [minor][https://github.com/frappe/erpnext/issues/9892] enabled all roles and domain before running tests (#3719) 2017-07-18 11:17:36 +05:30
Rushabh Mehta
368bbeeb29 [fix] filters for calendars frappe/erpnext#9850 (#3686)
* [fix] filters for calendars frappe/erpnext#9850

* [add] tests
2017-07-18 10:50:26 +05:30
Prateeksha Singh
45cff1a195 [graph] set multiplier based on int length (#3720) 2017-07-18 10:33:57 +05:30
Frappe PR Bot
4885ecb116 [Translation] Updated Translations (#3710) 2017-07-17 17:50:51 +05:30