Rohit Waghchaure
8a2c83918b
changed user_roles to roles
2017-03-06 14:42:13 +05:30
Rohit Waghchaure
1e8fd83e7b
commonify role editor
2017-03-06 14:41:10 +05:30
Rohit Waghchaure
cc37c5fda8
rename page role to has role, added doctype custom role to set the roles, added screen to set roles to the page and report
2017-03-06 14:38:54 +05:30
Rohit Waghchaure
e57e9f170b
[Enhancement] Provision to add roles in the report
2017-03-06 14:38:54 +05:30
Rushabh Mehta
bd74036e07
[minor] [patch] drop in_dialog column in DocType
2017-03-06 14:33:04 +05:30
Faris Ansari
7a08311817
fix paging area, selected items ( #2802 )
2017-03-06 13:47:38 +05:30
Faris Ansari
1a76d64781
ListView refactor ( #2715 )
...
* [list_settings] save last_view, kanban_board, gantt_mode
* listview.js cleanup
* image_view refactor
* image_view done
* wip
* [photoswipe] wip
* show view for calendar, kanban even if no results
* [gantt_view] refactor into separate file
* [imageview] 3 column border fix
* [imageview] gallery working
* delete old libs
* indentation to tabs
* [gantt] update lib, custom popup html
* custom fontawesome checkbox
* reset gantt state when not permitted
* checkbox styling fix
* working commit
* image, calendar, gantt view working
* more refactoring, kanban view
* minor
* removed old files
* user settings improved
* filters and sort selector de-coupling
* wip
* [imageview] white pswp background
* kanban filters saving fixed
* fixed reportview
* minor
* removed listing.js
* minor fixes and cleanup
* patch for UserSettings table
* patch fix
2017-03-06 11:32:27 +05:30
Nabin Hait
4fecbd15af
Merge pull request #2799 from AWDGroup/patch-1
...
Update country_info.json
2017-03-05 14:54:05 +05:30
Ardavan K
ebf82e8b6f
Update country_info.json
...
added the missing comma
2017-03-05 11:51:10 +03:30
Rushabh Mehta
6dff729d88
[enhance] Web View settings in DocType ( #2798 )
...
* [enhance] add web view settings doctype
* [enhance] add web view settings doctype
* [fix] default for checks (?)
* [fix] framework json
* [fix] missing return
* [fix] hooks for website_generators
2017-03-05 11:12:32 +05:30
Ardavan K
d9d7165d31
Update country_info.json
...
Added currency symbol & timezone for Iran
2017-03-05 01:41:24 +03:30
Nabin Hait
fafa89977f
Merge pull request #2797 from mbauskar/feedback
...
[enhancement] auto feedback request should be triggered only once
2017-03-04 18:37:40 +05:30
mbauskar
2373cb7f1f
[enhancement] auto feedback request should be triggered only once
2017-03-03 10:32:49 +05:30
Nabin Hait
b8bf36e45b
Merge branch 'master' into develop
2017-03-02 22:43:21 +05:30
Nabin Hait
f459919abe
Merge branch 'hotfix'
2017-03-02 22:43:21 +05:30
Nabin Hait
8c47848a00
bumped to version 7.2.27
2017-03-02 23:13:21 +06:00
Nabin Hait
d7a49fd034
Merge pull request #2795 from netchampfaris/calendar-colors
...
calendar event colors
2017-03-02 22:42:06 +05:30
Nabin Hait
b5936ffa82
Validate sub-query in order by and group by
2017-03-02 18:50:04 +05:30
Rushabh Mehta
925d315006
[minor] website fixes
2017-03-02 18:06:16 +05:30
Nabin Hait
ec63a8048e
Merge branch 'hotfix'
2017-03-02 18:03:33 +05:30
Nabin Hait
f9139dee31
Merge branch 'master' into develop
2017-03-02 18:03:33 +05:30
Nabin Hait
dc35c1ddba
bumped to version 7.2.26
2017-03-02 18:33:33 +06:00
Nabin Hait
cc12dc033e
Minor fix
2017-03-02 18:02:46 +05:30
Faris Ansari
bef6bdfd00
calendar event colors
2017-03-02 17:58:26 +05:30
Nabin Hait
6bdb453cb4
Update db_query.py
2017-03-02 17:49:30 +05:30
Nabin Hait
0a844d15d5
Fixed merge conflict
2017-03-02 17:02:40 +05:30
Nabin Hait
e52e37fc10
Merge branch 'hotfix'
2017-03-02 16:59:25 +05:30
Nabin Hait
cefd90d090
bumped to version 7.2.25
2017-03-02 17:29:25 +06:00
Nabin Hait
16e437db7d
Merge pull request #2793 from mbauskar/hotfix
...
[minor] filter dashboard fixes
2017-03-02 16:57:26 +05:30
Nabin Hait
bf310c59b4
Merge pull request #2794 from saurabh6790/sql_injection_fixes
...
[fix] consider optional fields too while chekcing sql injection
2017-03-02 16:56:02 +05:30
Saurabh
b2b2df56aa
[fix] consider optional fields too while chekcing sql injection
2017-03-02 16:52:21 +05:30
mbauskar
ab862b060c
[minor] filter dashboard fixes
2017-03-02 16:39:22 +05:30
Nabin Hait
5f5d3066fa
Merge pull request #2784 from saurabh6790/sql_injection_fixes
...
[security][fix] fixed order by and group by clause vulnerability for sql injection
2017-03-02 14:09:12 +05:30
Rushabh Mehta
6962962211
[fix] contact us to create communication and blog list
2017-03-02 13:06:45 +05:30
Nabin Hait
29d9abb7bd
Update db_query.py
2017-03-02 13:01:41 +05:30
Nabin Hait
25bce97acd
Update db_query.py
2017-03-02 12:57:49 +05:30
Nabin Hait
f8e5a7a75a
Merge pull request #2786 from ratskin/patch-1
...
[minor] Fixed spelling mistake
2017-03-02 12:42:59 +05:30
Nabin Hait
04458ab988
Merge pull request #2790 from pratu16x7/communication-remove
...
[minor]Remove communication from search
2017-03-02 12:42:28 +05:30
Nabin Hait
67da957b8c
Merge pull request #2789 from KanchanChauhan/deleted-document-error-msg
...
Error message on restoring Cancelled Document
2017-03-02 12:41:53 +05:30
Nabin Hait
de8bca68f9
Merge pull request #2791 from KanchanChauhan/editable-field-fix
...
[Fix] Show dialog if field is editable and not hidden
2017-03-02 12:40:54 +05:30
Nabin Hait
2f024ddbb2
Merge pull request #2792 from KanchanChauhan/webpage-title
...
[Fix] Webpage title fix
2017-03-02 12:39:42 +05:30
Nabin Hait
df1a596b44
Merge branch 'master' into develop
2017-03-02 12:37:37 +05:30
Nabin Hait
76dea9c4aa
Merge branch 'hotfix'
2017-03-02 12:37:36 +05:30
Nabin Hait
cf0b897a5e
bumped to version 7.2.24
2017-03-02 13:07:36 +06:00
Kanchan Chauhan
8f58649905
[Fix] Webpage title fix
2017-03-02 12:35:56 +05:30
Rushabh Mehta
96dd947111
[minor] add progress in desktop help message
2017-03-02 11:12:55 +05:30
Kanchan Chauhan
94121be1b4
[Fix] Show dialog if field is editable and not hidden
2017-03-01 18:29:58 +05:30
Nabin Hait
29d771d0c0
Merge branch 'master' into develop
2017-03-01 15:08:28 +05:30
Nabin Hait
494f39de78
Merge branch 'hotfix'
2017-03-01 15:08:27 +05:30
Nabin Hait
4f9676b221
bumped to version 7.2.23
2017-03-01 15:38:27 +06:00
