Commit graph

13307 commits

Author SHA1 Message Date
Rushabh Mehta
07819a6eca Merge pull request #3890 from ci2014/patch-8
Update list.html
2017-08-10 09:40:37 +05:30
ci2014
3d7d8044b0 Update list.html
Add _() to More Button, to translate the button.
2017-08-09 18:42:56 +02:00
Rushabh Mehta
92403aabba [fix] disable twofactor 2017-08-09 16:27:56 +05:30
mbauskar
9d4767ae3f Merge branch 'master' into develop 2017-08-09 16:01:42 +05:30
mbauskar
7b505f686f Merge branch 'hotfix' 2017-08-09 16:01:42 +05:30
mbauskar
5b9706ddbc bumped to version 8.7.2 2017-08-09 16:31:42 +06:00
Nabin Hait
b7dcc47032 Minor fix in client.get_value 2017-08-09 15:54:24 +05:30
rohitwaghchaure
8e362dfe56 [Fix] User not able to delete if it's linked with the communication (#3884) 2017-08-09 15:33:15 +05:30
Rushabh Mehta
223d692921 Merge pull request #3883 from mbauskar/uncode-fixes
[hotfix] encode file name to unicode
2017-08-09 12:15:42 +05:30
mbauskar
2745ce407c [hotfix] encode file name to unicode 2017-08-09 12:12:00 +05:30
mbauskar
81c75602f2 Merge branch 'master' into develop 2017-08-09 11:16:16 +05:30
mbauskar
ab8c3644e2 Merge branch 'hotfix' 2017-08-09 11:16:16 +05:30
mbauskar
d895950feb bumped to version 8.7.1 2017-08-09 11:46:16 +06:00
Makarand Bauskar
6298446be8 [hotfix] encode title and content field for global search (#3881) 2017-08-09 11:01:07 +05:30
mbauskar
8de57381bf Merge branch 'master' into develop 2017-08-08 16:07:10 +05:30
mbauskar
6404c6e167 Merge branch 'staging' 2017-08-08 16:07:10 +05:30
mbauskar
02d9e69e60 bumped to version 8.7.0 2017-08-08 16:37:10 +06:00
Makarand Bauskar
eefbf5e61e [v8.7.0] added change log for version 8.7.0 (#3878) 2017-08-08 16:03:37 +05:30
Rushabh Mehta
03520ea588 [fix] top padding for login 2017-08-08 15:21:14 +05:30
Rushabh Mehta
b6204a126a Merge pull request #3873 from rmehta/ui-fixes
[fixes] bunch of ui fixes
2017-08-08 15:05:50 +05:30
Rushabh Mehta
c63cdc5adf [minor] remove 2fa from setup wizar 2017-08-08 14:59:22 +05:30
Rushabh Mehta
c8e04b3de0 Merge pull request #3877 from rmehta/manqala-twofactor
Two Factor Authentication
2017-08-08 14:54:16 +05:30
Rushabh Mehta
a6e1210162 [fix] tests 2017-08-08 14:42:02 +05:30
Rushabh Mehta
925e5922eb [minor] cleaned code from user.js 2017-08-08 14:35:07 +05:30
Rushabh Mehta
e5138af195 [add] disable 2fa 2017-08-08 14:32:32 +05:30
Rushabh Mehta
bc4d46a362 [fix] style and move setup to system settings 2017-08-08 14:29:22 +05:30
mbauskar
a5d3c90e97 resolved merge conflicts 2017-08-08 12:52:50 +05:30
mbauskar
5a69717ee1 Merge branch 'master' into develop 2017-08-08 12:51:33 +05:30
mbauskar
bd0aac2d98 Merge branch 'hotfix' 2017-08-08 12:51:32 +05:30
mbauskar
7b90a9a9e9 bumped to version 8.6.8 2017-08-08 13:21:32 +06:00
Makarand Bauskar
bb750d5739 [test] test_customize_form.js (#3875) 2017-08-08 12:23:32 +05:30
Rushabh Mehta
4e42ed65e1 Merge branch 'twofactor' of https://github.com/manqala/frappe into manqala-twofactor 2017-08-08 11:58:22 +05:30
Rushabh Mehta
cdfcf10e08 [fixes] bunch of ui fixes 2017-08-08 11:55:54 +05:30
rohitwaghchaure
57f1d351be [Fix] Workflow is not working even if the user has permission to submit the record (#3871) 2017-08-08 11:32:57 +05:30
Vishal Dhayagude
95a3737890 [fix] Refresh links child table in address.js (#3863)
* [fix] Refresh links child table in address.js

* Update address.js
2017-08-08 11:31:16 +05:30
Rushabh Mehta
b39b59583f [fix] add theme color (#3869) 2017-08-07 18:03:03 +05:30
Revant Nandgaonkar
f8387ac039 added whitelisted function get_time_zone (#3843) 2017-08-07 18:02:48 +05:30
Faris Ansari
b1b71a6bb9 fix event test (#3868)
* fix event test

* fix codacy
2017-08-07 15:52:18 +05:30
Faris Ansari
0a3d5c7f07 Fix footer overlap in print preview (#3866) 2017-08-07 13:43:55 +05:30
Makarand Bauskar
5cf03a4282 [minor] pass null instead of false if there are no unsaved changes (#3860) 2017-08-07 13:36:49 +05:30
Faris Ansari
44ee24aa75 Colors in Event Calendar using color picker (#3857)
* Add Color field to Event, show colored event in calendar

* [minor] handle edge cases

* Fix test boilerplate

* Add test for event

* fix codacy

* fix test
2017-08-07 13:36:27 +05:30
Manas Solanki
c9df03b60d validate the sender email id (#3862) 2017-08-07 13:36:03 +05:30
Faris Ansari
8dc9645cdb Decrease website sidebar width, push down for mobile (#3864) 2017-08-07 13:35:22 +05:30
Ashwini Save
343b4cfccd Change icons in timeline to Text-All-Format #10273 (#3859)
* Change icons in timeline to Text-All-Format #10273

* Changes for delete icon and alignment fixes.
2017-08-07 13:34:50 +05:30
B H Boma
64048e14ac Enable 2fa in sites config instead of system settings, also enabled for admin 2017-08-04 15:59:29 +01:00
Rushabh Mehta
26a75925ea [minor] indicator in form.js 2017-08-04 16:57:20 +05:30
Rushabh Mehta
644430754e [minor] sidebar in website not hidden in mobile 2017-08-04 15:49:18 +05:30
Rushabh Mehta
242bfa421f [minor] clear headline 2017-08-04 12:36:45 +05:30
mbauskar
e4675498bb Merge branch 'master' into staging 2017-08-04 11:02:07 +05:30
mbauskar
52182a27f3 Merge branch 'hotfix' 2017-08-04 11:02:07 +05:30