Faris Ansari
|
d1a9f0194c
|
Show totals row always in query report
|
2017-08-10 16:12:31 +05:30 |
|
mbauskar
|
17e58a8413
|
Merge branch 'master' into develop
|
2017-08-10 16:12:07 +05:30 |
|
mbauskar
|
67e13e45f0
|
Merge branch 'hotfix'
|
2017-08-10 16:12:06 +05:30 |
|
mbauskar
|
31e9ad6b3f
|
bumped to version 8.7.3
|
2017-08-10 16:42:06 +06:00 |
|
Rushabh Mehta
|
3e52f44a79
|
[minor] contact.js
|
2017-08-10 16:09:08 +05:30 |
|
KanchanChauhan
|
43c16d1e72
|
Activate primary action on Enter in dialog (#3895)
|
2017-08-10 15:09:49 +05:30 |
|
Rushabh Mehta
|
99d47b52e7
|
Merge pull request #3896 from rmehta/ci-errors
[fix] for ci
|
2017-08-10 15:09:37 +05:30 |
|
Makarand Bauskar
|
e586ef441e
|
[fix] multiple grid_row fetch (#3856) (#3892)
|
2017-08-10 14:55:16 +05:30 |
|
Rushabh Mehta
|
9785e925b7
|
[fix] for ci
|
2017-08-10 14:55:04 +05:30 |
|
Rushabh Mehta
|
f4700957fa
|
[fix] dont watch in CI
|
2017-08-10 14:16:34 +05:30 |
|
Rushabh Mehta
|
c445047d1c
|
[fix] dont watch in CI
|
2017-08-10 11:58:57 +05:30 |
|
Rushabh Mehta
|
e42df8a180
|
[tests] ignore if docinfo not loaded
|
2017-08-10 11:55:34 +05:30 |
|
Rushabh Mehta
|
7954ea453c
|
[tests] less verbose logs
|
2017-08-10 11:50:22 +05:30 |
|
Rushabh Mehta
|
6081c30971
|
[tests] less verbose logs
|
2017-08-10 11:11:04 +05:30 |
|
Rushabh Mehta
|
aa370aef36
|
[tests] less verbose logs
|
2017-08-10 11:02:36 +05:30 |
|
mbauskar
|
792731423e
|
Merge branch 'develop' into staging
|
2017-08-10 10:54:59 +05:30 |
|
Rushabh Mehta
|
07819a6eca
|
Merge pull request #3890 from ci2014/patch-8
Update list.html
|
2017-08-10 09:40:37 +05:30 |
|
Rushabh Mehta
|
3570c43b8c
|
Merge pull request #3889 from bcornwellmott/fix10167
[Fix] workflow override
|
2017-08-10 09:17:03 +05:30 |
|
ci2014
|
3d7d8044b0
|
Update list.html
Add _() to More Button, to translate the button.
|
2017-08-09 18:42:56 +02:00 |
|
bcornwellmott
|
f6ed730804
|
Merge branch 'hotfix' into fix10167
|
2017-08-09 09:08:25 -07:00 |
|
Rushabh Mehta
|
8de93ed43e
|
Merge pull request #3888 from frappe/revert-3886-test-lib
Revert "[hotfix] fixes for Uncaught TypeError: Cannot read property 'doc' of undefined"
|
2017-08-09 18:34:18 +05:30 |
|
Makarand Bauskar
|
f5f1c42775
|
Revert "[hotfix] fixes for Uncaught TypeError: Cannot read property 'doc' of undefined (#3886)"
This reverts commit 880361db46.
|
2017-08-09 17:58:35 +05:30 |
|
Makarand Bauskar
|
880361db46
|
[hotfix] fixes for Uncaught TypeError: Cannot read property 'doc' of undefined (#3886)
|
2017-08-09 17:51:39 +05:30 |
|
Rushabh Mehta
|
92403aabba
|
[fix] disable twofactor
|
2017-08-09 16:27:56 +05:30 |
|
mbauskar
|
7b505f686f
|
Merge branch 'hotfix'
|
2017-08-09 16:01:42 +05:30 |
|
mbauskar
|
9d4767ae3f
|
Merge branch 'master' into develop
|
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
|
ab8c3644e2
|
Merge branch 'hotfix'
|
2017-08-09 11:16:16 +05:30 |
|
mbauskar
|
81c75602f2
|
Merge branch 'master' into develop
|
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
|
6404c6e167
|
Merge branch 'staging'
|
2017-08-08 16:07:10 +05:30 |
|
mbauskar
|
8de57381bf
|
Merge branch 'master' into develop
|
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 |
|