Commit graph

17155 commits

Author SHA1 Message Date
Suraj Shetty
4f965c2ea5
Social fixes (#6388)
* Disable post button on click

* Remove redundant code
2018-11-02 17:06:56 +05:30
Suraj Shetty
5d75f95ec9 Social fixes (#6375)
* Fix post and post comment permissions

- User should be able to edit only his post/comment
- other post should and comment should be readonly

* Separate scroll to section function

* Add a test fix

* Hide activity on mobile view for now

* fix: Return early if no session user

* chore: Remove empty test files

* Add semicolon

* Return if doc.owner is not present
2018-11-02 14:45:24 +05:30
Stavros Anastasiadis
aed3114a8f Fix conditional statement (#6378) 2018-11-01 18:31:10 +05:30
Ameya Shenoy
edaeaec5f3
Merge branch 'staging' into develop 2018-10-31 13:50:21 +00:00
Ameya Shenoy
ae558c6d52
Merge branch 'staging-fixes' into staging 2018-10-31 13:48:40 +00:00
Ameya Shenoy
8944f94169 bumped to version 11.0.3-beta.19 2018-10-31 13:48:40 +00:00
Nabin Hait
6bf1fad37e Update database.py 2018-10-31 18:43:06 +05:30
Nabin Hait
f4db502ab8 feat(success action): configurable timeout on success action 2018-10-31 18:43:06 +05:30
Nabin Hait
6bbd23f2cd fix(debug): Print query if debug true 2018-10-31 18:43:06 +05:30
Nabin Hait
5ee61a0578 fix(fetch-from): ignore updating based on fetch-from if single doctype 2018-10-31 18:43:06 +05:30
Nabin Hait
8a1c762a7c fix(bulk-update): Rollback on exceptions 2018-10-31 18:43:06 +05:30
Ameya Shenoy
62736ba219
Merge branch 'staging' into develop 2018-10-31 10:58:47 +00:00
Ameya Shenoy
ca72c772f1
Merge branch 'staging-fixes' into staging 2018-10-31 10:46:24 +00:00
Ameya Shenoy
0fb1df0964 bumped to version 11.0.3-beta.18 2018-10-31 10:46:24 +00:00
Ameya Shenoy
55fbf7ad99
Merge branch 'master' into staging-fixes 2018-10-31 10:40:55 +00:00
Ameya Shenoy
a26dd436f5
Merge branch 'hotfix' 2018-10-31 10:36:54 +00:00
Ameya Shenoy
977b5a118e bumped to version 10.1.58 2018-10-31 10:36:54 +00:00
Ameya Shenoy
9807341146
Merge pull request #6370 from saurabh6790/sql_injection_fix_3110
[fix] potential sql injection by sanitizing fields parameter
2018-10-31 16:04:29 +05:30
Saurabh
a1e68b6fd5 [fix] potential sql injection by sanitizing fields parameter 2018-10-31 14:26:22 +05:30
Ameya Shenoy
742f0d2602
Merge branch 'staging' into develop 2018-10-31 07:29:46 +00:00
Ameya Shenoy
334859a334
Merge branch 'staging-fixes' into staging 2018-10-31 07:29:05 +00:00
Ameya Shenoy
24bdcd05cc bumped to version 11.0.3-beta.17 2018-10-31 07:29:05 +00:00
rohitwaghchaure
000c61ab87
Merge pull request #6365 from rohitwaghchaure/conflicts_issues
Fixed conflicts
2018-10-31 12:23:51 +05:30
Rohit Waghchaure
44441d8ce7 Fixed conflicts 2018-10-31 12:09:31 +05:30
Ameya Shenoy
26099e8b0b
Merge pull request #6362 from shreyashah115/fix-delete
Revert series count after doc deletion
2018-10-31 11:30:04 +05:30
Himanshu
4ea7aa4f6c code refactor (#6360) 2018-10-31 11:16:45 +05:30
Faris Ansari
9d29139c25 fix: Dont refresh list if filters are being edited (#6354) 2018-10-31 11:16:14 +05:30
Faris Ansari
755bb6b63f fix(chat): Separate setup code from constructor (#6363)
- to avoid class transpilation issue
2018-10-31 11:15:09 +05:30
Ameya Shenoy
ee3ae7abea
Merge branch 'staging' into develop 2018-10-30 12:52:16 +00:00
Ameya Shenoy
0e0c103a32
Merge branch 'staging-fixes' into staging 2018-10-30 12:50:41 +00:00
Ameya Shenoy
c99e8e26f8 bumped to version 11.0.3-beta.16 2018-10-30 12:50:41 +00:00
Ameya Shenoy
25a0b8dba2
Merge branch 'master' into staging-fixes 2018-10-30 12:09:41 +00:00
Ameya Shenoy
acd190cf9e
Merge branch 'hotfix' 2018-10-30 12:06:19 +00:00
Ameya Shenoy
00f5ce0034 bumped to version 10.1.57 2018-10-30 12:06:18 +00:00
Faris Ansari
6683814cfc
Merge pull request #6351 from frappe/jinja-patch
fix(security): Make Jinja tighter
2018-10-30 17:28:26 +05:30
Ameya Shenoy
dd0e7ba472
fix(help): mitigate security fix for docs
Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
2018-10-30 17:13:00 +05:30
Aditya Hase
3afb9ebcbc
fix(security): Make Jinja tighter 2018-10-30 13:13:42 +05:30
Shreya
aca6dd0686 test: Add test case 2018-10-30 12:13:28 +05:30
Frappe PR Bot
2975d2ef75 [Translation] Updated Translations (#6346) 2018-10-30 11:19:07 +05:30
Charles-Henri Decultot
377bed7007 [Fix] Auto repeat corrections (#6262)
* Auto repeat corrections

* Correct tests

* Additional test for linked communication

* Cleanup dev

* Remove whitespace
2018-10-30 11:18:08 +05:30
Navdeep Ghai
c00bf28f15 Patch to modify Int datatype to bigint in tabSeries table (#6284)
* added patch for converting int to bigint in  table

* patch to modify the  int type  to bigint type in  table

* Update modify_naming_series_table.py

* Update modify_naming_series_table.py
2018-10-30 11:15:00 +05:30
Himanshu Mishra
e53c72a627 added @read_only to a few calls and converted a few read only calls to GET (#6299) 2018-10-30 11:13:25 +05:30
Karan Sharma
a8342b1c8a frappe/upload.js: Fix undefined socketio object (#6308) 2018-10-30 11:05:16 +05:30
Karan Sharma
a4935e9ae4 frappe/chat.js: Fix check for momentjs (#6310) 2018-10-30 11:04:28 +05:30
Karan Sharma
943b66714d Make user permission check as case-insensitive (#6313) 2018-10-30 11:02:22 +05:30
Jay Parikh
d3c67e8bb5 Fix for [hotfix] [Bug] ListView Filter shows hidden field #6329 (#6331)
* New keyboard shortcut combination.

add shift+ the key, add alt+ the key, add alt+ctrl+ the key or single key e.g f1,f2,etc..

* Fixed Indentation Issues.

* Issue fix (no-self-assign)

* Fix for ListView Filter shows hidden field #6329
2018-10-30 10:59:14 +05:30
Shreya Shah
db0889131d fix: Add fieldname property (#6349) 2018-10-30 10:50:20 +05:30
Sagar Vora
a8d6c0b2a7 feat(dropbox integration): add ability to delete older DB backups (#6332) 2018-10-30 10:47:35 +05:30
Jay Parikh
35d08c124e Fix for [staging-fixes] [Bug] ListView Filter shows hidden field #6329 (#6338) 2018-10-30 10:38:54 +05:30
Prateeksha Singh
f56000989e
[hotfix] remove legend from heatmap 2018-10-30 09:48:40 +05:30