Commit graph

11450 commits

Author SHA1 Message Date
Nabin Hait
ca1cd65fa4 Merge branch 'hotfix' 2017-03-15 11:26:00 +05:30
Nabin Hait
566eca110a bumped to version 7.2.30 2017-03-15 11:56:00 +06:00
Nabin Hait
08a2b87330 Merge pull request #2844 from mbauskar/hotfix
[hook] added before_change hook to trigger email_alerts before db_set
2017-03-12 16:52:45 +05:30
Rushabh Mehta
cd3257d2d3 [minor] rever set_footnote function 2017-03-10 15:35:05 +05:30
Nabin Hait
e3b63b7348 Merge pull request #2843 from rmehta/remove-push-notifications
[minor] remove push notifications
2017-03-10 14:38:43 +05:30
Nabin Hait
208ad88c55 Merge pull request #2841 from rmehta/clear-notifications
[fix] clear notifications for user
2017-03-10 14:29:52 +05:30
Rushabh Mehta
3716564b8f [minor] remove notifications 2017-03-10 12:22:08 +05:30
Rushabh Mehta
82254cbe68 [minor] remove push notifications 2017-03-10 11:47:18 +05:30
mbauskar
5cd886b8cf [hook] added before_change hook to trigger email_alerts before db_set 2017-03-10 09:51:01 +05:30
Rushabh Mehta
89185c4efe [minor] fix for in_install 2017-03-09 18:27:41 +05:30
Rushabh Mehta
95e6306cc0 [minor] fix for in_install 2017-03-09 18:18:13 +05:30
Rushabh Mehta
9484ea1af3 [fix] clear notifications for user 2017-03-09 18:09:42 +05:30
Nabin Hait
1b222d20c9 Merge branch 'hotfix' 2017-03-09 14:59:01 +05:30
Nabin Hait
24b43bfc42 bumped to version 7.2.29 2017-03-09 15:29:01 +06:00
Nabin Hait
0f71ba0d3f Merge pull request #2836 from rmehta/fix-html5lib
[fix] fix html5lib compatibility issue
2017-03-09 14:44:41 +05:30
Rushabh Mehta
2e1d0fe71e [minor] html_utils.py, bleach.linkify remove tokenizer 2017-03-09 14:02:26 +05:30
Rushabh Mehta
70db4e7fc7 [fix] welcome mail if no other app 2017-03-09 13:27:38 +05:30
Rushabh Mehta
8a83a9bfed [fix] fix html5lib compatibility issue 2017-03-09 13:20:40 +05:30
Nabin Hait
0e85e30789 Merge pull request #2833 from rmehta/grid-mandatory
[fixes] mandatory css in grids, better welcome email
2017-03-09 11:04:22 +05:30
Rushabh Mehta
614098a84a [fixes] mandatory css in grids, better welcome email 2017-03-08 22:52:54 +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
Nabin Hait
1652460f2a Merge branch 'hotfix' 2017-03-08 11:08:16 +05:30
Nabin Hait
64a10c0543 bumped to version 7.2.28 2017-03-08 11:38:16 +06:00
Wael AlShurafa
d3c6ac6d8a Fix operator validation 2017-03-07 21:53:43 +02:00
Wael AlShurafa
3033aa4d5b Fix condition operator case sensitivity 2017-03-07 21:52:20 +02:00
Nabin Hait
dcc170d1b5 minor patch fix 2017-03-07 22:34:52 +05:30
Nabin Hait
94af0d9943 Merge pull request #2761 from RobertSchouten/from_parse_dev
[hotfix] fix email from decode
2017-03-07 12:55:50 +05:30
Nabin Hait
2f3f17a09b Merge pull request #2778 from yshurrab/translations-passed-lang-fix
Translate the msg in _ function according to the passed lang, support…
2017-03-06 14:30:49 +05:30
Yaqin Shurrab
59637ae0a2 resove conflict 2017-03-06 10:06:26 +02:00
Yaqin Shurrab
0239b24ca0 making code simpler as @mmoksh suggessted 2017-03-06 10:03:28 +02:00
Yaqin Shurrab
337812e405 making code simpler as @mmoksh suggessted 2017-03-06 10:00:38 +02:00
Yaqin Shurrab
67f7706c7e reslove conflict 2017-03-05 14:01:39 +02:00
Yaqin Shurrab
81f11d12a2 resolve conflict 2017-03-05 13:59:57 +02:00
Yaqin Shurrab
ee692e0e07 resolve conflict 2017-03-05 13:39:10 +02:00
Yaqin Shurrab
ff85aa9319 Fix error in applied changes causes The Travis CI build fail 2017-03-05 13:37:28 +02:00
Yaqin Shurrab
6c40d4313b Fix error in applied changes causes The Travis CI build fail 2017-03-05 13:29:23 +02:00
Yaqin Shurrab
c6f3350bae resolve conflict, apply reviewer changes 2017-03-05 12:54:39 +02:00
Yaqin Shurrab
8d06587d49 Update as the reviewer asked for changes 2017-03-05 12:52:38 +02:00
Rushabh Mehta
5001e92ff9 Update translate.py 2017-03-05 11:19:49 +05:30
Rushabh Mehta
e8dd3b0d84 Update __init__.py 2017-03-05 11:15:01 +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
b5936ffa82 Validate sub-query in order by and group by 2017-03-02 18:50:04 +05:30
Nabin Hait
ec63a8048e Merge branch 'hotfix' 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
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