vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
13812 commits 1 branch 0 tags 587 MiB
Commit graph

149 commits

Author SHA1 Message Date
Rushabh Mehta
5a31e583a2 Merge pull request #3912 from adityahase/fix-raise 
Replace Py2 raise syntax with Py 3
 2017-08-11 13:01:40 +05:30
Aditya Hase
2da880fc42 Replace Py2 raise syntax with Py 3 2017-08-11 00:38:58 +05:30
Aditya Hase
769338f136 Replaced all instances of basestring with six.string_types 2017-08-11 00:10:11 +05:30
mbauskar
53167626ab resolved merge conflicts 2017-08-02 18:32:30 +05:30
Makarand Bauskar
fc715efdbb [hotfix] fixes for AttributeError: 'NoneType' object has no attribute 'split' (#3840) 
* [hotfix] fixes for AttributeError: 'NoneType' object has no attribute 'split'

* [tests] added test cases for not in and in filters
 2017-08-02 12:47:10 +05:30
Rushabh Mehta
f609a478ae [refactor] user permissions (#3713) 
* [refactor] user permissions

* [fix] tests

* [ux] user-permissions

* [minor] cleanup system settings

* [minor] end progress
 2017-07-28 14:33:31 +05:30
Manas Solanki
d0857f8013 Apply User Permissions is being ignored for blank field values (#3496) 
* issue where Apply User Permissions is being ignored for blank field values

* configurable settings and added test case

* Update system_settings.json

* save and use locally stored value for strict user permission
 2017-07-06 10:48:12 +05:30
tundebabzy
bbde2ec4cf rewrite use of dict.iteritems (#3498) 
* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility
 2017-06-19 09:10:21 +05:30
Rushabh Mehta
0a5df4fb4d [debug] show where permission is failing (#3264) 
* [debug] show where permission is failing

* [fix] document.py
 2017-05-11 11:46:47 +05:30
Rushabh Mehta
262f361021 [minor] ignore permissions option for filters in db_query (#3234) 2017-05-06 12:43:47 +05:30
Makarand Bauskar
8eeda18692 [fixes] minor fix for between operator filter (#3196) 
* [fixes] minor fix for between operator filter

* [minor] added a test case for between operator filter
 2017-05-01 14:14:04 +05:30
Faris Ansari
95edd73b5b Fix Date between query 2017-04-28 14:43:32 +05:30
Rushabh Mehta
4832c3b50f [fix] missing first column in HTML for auto_email_report 2017-04-26 15:33:59 +05:30
Rushabh Mehta
346bbb008e [fix] ux for auto email report 2017-04-25 12:58:10 +05:30
Nabin Hait
7fe50c885a Merge branch 'master' into develop 2017-03-09 14:59:02 +05:30
Nabin Hait
54af579e09 Merge pull request #2823 from wshurafa/fix-query-condition-case-sensitivity 
Fix query condition case sensitivity
 2017-03-08 14:03:06 +05:30
Wael AlShurafa
3033aa4d5b Fix condition operator case sensitivity 2017-03-07 21:52:20 +02:00
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
b8bf36e45b Merge branch 'master' into develop 2017-03-02 22:43:21 +05:30
Nabin Hait
b5936ffa82 Validate sub-query in order by and group by 2017-03-02 18:50:04 +05:30
Nabin Hait
cc12dc033e Minor fix 2017-03-02 18:02:46 +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
Saurabh
b2b2df56aa [fix] consider optional fields too while chekcing sql injection 2017-03-02 16:52:21 +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
Saurabh
acb660322d [fix] trim whitespaces 2017-02-28 19:15:39 +05:30
Saurabh
049d51cdf1 [security][fix] fixed order by and group by clause vulnerability for sql injection 2017-02-28 18:52:07 +05:30
Rushabh Mehta
d579cea70d Configurable Website Sidebar in Web Pages (#2530) 
* [wip] website fixes

* [added] Website Sidebar
 2016-12-30 12:39:01 +05:30
Nabin Hait
3bb9af2801 Merge pull request #2511 from rmehta/auto-email-fixes 
[fix] formatting and modified filters for auto email report, fixes frappe/erpnext#7081 and frappe/erpnext#7147
 2016-12-29 13:11:49 +05:30
Nabin Hait
9fac886ed8 In search query consider sort_field from meta (#2515) 2016-12-29 10:47:14 +05:30
Rushabh Mehta
da7537f872 [minor] remove print 2016-12-26 13:05:27 +05:30
Rushabh Mehta
eabceaec56 [fix] formatting and modified filters for auto email report, fixes frappe/erpnext#7081 and frappe/erpnext#7147 2016-12-26 13:03:57 +05:30
Nabin Hait
c52dc83256 Fixed merge conflict 2016-12-06 16:12:32 +05:30
Rohit Waghchaure
82ac63e5ac [Fix] Total row not working in the report for the report builder type 2016-12-06 16:05:26 +05:30
Rushabh Mehta
391aeb9979 [fix] condition for between 2016-11-18 18:10:20 +05:30
robert schouten
5ede870700 daterangepicker now as control for filtering (#2324) 
* daterangepicker now as control for filtering

* rename daterange picker options

* cleanup name reference

* allow greater control of daterangepicker options

* Update data.py

comma + space
 2016-11-18 14:03:56 +05:30
Rushabh Mehta
8899a46faa [enhance] added roles for portal users #2091 (#2093) 
* [enhance] added roles for portal users #2091

* [fix] test

* [fix] make default roles have desk access
 2016-09-23 21:44:20 +05:30
Nabin Hait
c1e5e5dabe Fixed version conflict 2016-09-14 15:52:32 +05:30
Nabin Hait
d1bf2429fe Fixed list settings 2016-09-12 13:04:52 +05:30
Nabin Hait
50d96413f9 Fixed merge conflict 2016-08-26 12:41:55 +05:30
Rushabh Mehta
e05dd38598 [fix] paging issues in listview (#2011) 2016-08-26 12:06:39 +05:30
Nabin Hait
7d75ab63f9 Merge branch 'master' into develop 2016-08-23 12:09:57 +05:30
Rushabh Mehta
4fe7de6971 [minor] removed formatting for date time comparison in db_query.py 2016-08-23 10:48:42 +05:30
Nabin Hait
f050cb27e3 [fix] Set user as session user if not mentioned in match conditions 2016-08-22 18:21:00 +05:30
Anand Doshi
234e21feee [fix] touch locks/installing.lock during new-site, fixes in db_query and get_app_path 2016-07-06 18:06:50 +05:30
Rushabh Mehta
9744c71399 [fix] ifnull in db_query 2016-07-04 17:07:38 +05:30
Kanchan Chauhan
fd8d2dd476 Permissions for if_owner fixed Permitted Document for User 2016-06-24 17:21:48 +05:30
Rushabh Mehta
ab3d1849bf [minor] 2016-06-14 18:09:07 +05:30
Rushabh Mehta
ce884882a2 [minor] fixes #1780 2016-06-06 09:18:49 +05:30