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

377 commits

Author SHA1 Message Date
Rushabh Mehta
fcaadf78ad
Merge pull request #6891 from rmehta/refactor-comments 
BREAKING CHANGE: Comments are now handled separately from Communication and Version
 2019-02-16 16:54:16 +05:30
Sagar Vora
17b20b22a3 Merge branch 'master' into develop 2019-02-12 16:31:54 +05:30
Rushabh Mehta
9a3bafdcfd fix(test): test and mandatory in blog post 2019-02-09 11:59:29 +05:30
Suraj Shetty
73c67481de
test: Change total post length 2019-02-06 16:27:46 +05:30
Nabin Hait
a7a4679a09 fix: tests for user permissions 2019-02-05 18:41:19 +05:30
Nabin Hait
ff1d430af6 fix: Set field default based on user permissions 2019-02-04 13:51:38 +05:30
Saurabh
76bd4e4f19 Merge branch 'master' into develop 2019-01-30 12:36:43 +05:30
Rushabh Mehta
d09792c606 fix: refactor global search to not insert after every commit (#6845) 
* fix: refactor global search to not insert after every commit

* feat: configuration to disable_global_search
 2019-01-30 11:13:51 +05:30
Sagar Vora
ef82f39f99 Merge branch 'staging' into develop 2019-01-29 18:24:11 +05:30
Suraj Shetty
5af8d4d1bb
Merge pull request #6824 from netchampfaris/feat-is-set-is-not-set 
feat: New filter type "Is Set", "Is Not Set"
 2019-01-29 07:27:57 +05:30
Aditya Hase
928ec12d35 fix(import): Import print_function once 2019-01-28 14:54:55 +05:30
Rushabh Mehta
f537d75946
feat: Allow website templates to have different base templates (#6811) 
* feat: Allow website templates to have different base templates

* test: custom base template
 2019-01-27 20:46:23 +05:30
Aditya Hase
837bfc0995 fix(unicode): Import unicode_literals in every file (#6805) 
* fix(unicode): Import unicode_literals in every file

* fix(unicode): Test if safe_json_loads return unicode instead of bytes
 2019-01-25 11:56:27 +05:30
Faris Ansari
2b336c235c tests: Add tests for "Is Set" and "Is Not Set" filter 2019-01-24 14:43:44 +05:30
Aditya Hase
6b72faf44f style: Linting fixes (#6809) 
* style: Remove unused imports

* style: Remove unused local variables
 2019-01-23 16:39:55 +05:30
Sagar Vora
47c0d10631 Merge branch 'staging' into develop 2019-01-22 15:43:40 +05:30
Suraj Shetty
95e9afa1f3 feat: Clear user permissions button (#6767) 
* Add button to delete user permissions in bulk

* Show no records deleted the delete count is 0

* Return this from show of dialog to make it chainable

* Add test for clear user permissions function

* Fix test

* Format code

* Reset the user

* Remove rollback from test

* Move clear user permission button to menu

* fix: Translations
 2019-01-21 16:52:12 +05:30
sahil28297
3644f5f4cd feat: relative timeframe filters (#6792) 
* feat: relative timeframe filters

* fix: resolve syntax errors

* fix: Translated options
 2019-01-21 16:02:40 +05:30
Faris Ansari
b7c4593200 Merge branch 'develop' of https://github.com/frappe/frappe into cast-numeric-values 2019-01-08 12:21:25 +05:30
Frappe Bot
1197271700 Fixed merge conflict 2019-01-05 09:06:05 +00:00
Suraj Shetty
9adbbd44c8 fix(permission): Role permission check with if_owner enabled (#6726) 
* Allow user to access list even if there is only a docperm with if owner enabled

* Add test to check if user gets access to the list

- User should be able to access list even if the user has only
 role for which docperm is created with if_owner check

* Remove commented code
 2019-01-05 14:31:40 +05:30
Rushabh Mehta
e46acc9bda fix(test): fixed quote issue 2019-01-03 16:11:58 +05:30
Rushabh Mehta
b66d233360 merge: staging-fixes for latest test fixes 2019-01-03 15:28:36 +05:30
Faris Ansari
6303089e4a test: Add test for get_single_value 2019-01-01 18:43:40 +05:30
Suraj Shetty
d3722cdaee test: Add code to test build_match_conditions (#6704) 
* Add code to test build match condition

* Fix typo

* Make quotes consistent

* Reorganize

* Fix test
- Add user permission for record created during test

* Reset session user as admin

* Fix a year dependent test
- Remove hardcoded year from test
 2019-01-01 15:04:30 +05:30
Saurabh
d5fdc670f7 Merge branch 'staging' into develop 2019-01-01 14:26:16 +05:30
Chinmay Pai
825b0120fa fix(login): redirect user from login page if already logged in (#6689) 
* fix(login): redirect user from login page if already logged in

the user should not be able to access the login page if a user session already exists. closes #6500.

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>

* fix(test-website): fix website test

what is the point in writing tests if they don't really work/function as intended?

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>

* fix(regex): do not replace '\' in rules

that defeats the entire purpose of creating rules, wtf?

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>

* fix(test_website): change user using set_user()

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>

* redirect: prefix string with r to escape string literals

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
 2018-12-31 13:46:55 +05:30
Frappe Bot
0499b4a845 Merge branch 'staging' into develop 2018-12-26 12:03:03 +00:00
Suraj Shetty
45911faa23
Merge branch 'staging-fixes' into staging-fixes 2018-12-18 15:26:11 +05:30
Saurabh
b727233948 Merge branch 'staging' into develop 2018-12-13 10:37:25 +05:30
Rushabh Mehta
0f5f04b409
fix(tests): one more attempt to fix the erratic test_scheduler.py (#6612) 
* debug(test_scheduler): please fail

* fix(tests): use flags instead of globals since cache is not trhead-safe
 2018-12-12 14:09:50 +05:30
Frappe Bot
c1ce84e9fc Merge branch 'staging' into develop 2018-12-11 09:53:52 +00:00
Rushabh Mehta
dad0b84847
fix(patch): check if table exists for old prepared reports (#6605) 
* debug(test): test_scheduler_events

* fix(patch): check if table exists for old prepared reports

* debug(tests): add comments for debug
 2018-12-11 11:08:50 +05:30
Suraj Shetty
390254b65d
Merge branch 'staging-fixes' into staging-fixes 2018-11-29 09:18:43 +05:30
Ameya Shenoy
c5d276b813
Merge branch 'staging' into develop 2018-11-28 08:24:00 +00:00
Ameya Shenoy
f513739d1a
Merge branch 'master' into staging-fixes 2018-11-28 07:53:35 +00:00
Saurabh
4738a9711a fix: tighten protection against sql injection (#6546) 2018-11-28 10:22:30 +05:30
Suraj Shetty
82c4180635 Add test to check if owner permission if applied properly 2018-11-05 08:36:08 +05:30
Suraj Shetty
3a40880bfd Pass reference doctype to search link to get contextual results 2018-11-02 12:56:10 +05:30
Suraj Shetty
4b0f78a6d5 Add test to check contextual user permission 2018-11-01 21:18:15 +05:30
Ameya Shenoy
62736ba219
Merge branch 'staging' into develop 2018-10-31 10:58:47 +00:00
Ameya Shenoy
55fbf7ad99
Merge branch 'master' into staging-fixes 2018-10-31 10:40:55 +00:00
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
Shreya
aca6dd0686 test: Add test case 2018-10-30 12:13:28 +05:30
Ameya Shenoy
aa4ef1b405
Merge branch 'staging' into develop 2018-10-23 08:04:11 +00:00
Rushabh Mehta
eba27d1a5c fix(test): test_scheduler fails randomly 2018-10-22 10:23:03 +05:30
Chinmay Pai
a5977ab22e file_manager: deprecate file_manager for file api (#6231) 
file_manager will be deprecated from v12 onwards, and shall be moved to a separate file api

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
 2018-10-15 10:38:49 +05:30
Ameya Shenoy
387f556dd5
Merge branch 'staging' into develop 2018-10-04 11:41:29 +00:00
Rushabh Mehta
5aaee31c49 fix(test): test_scheduler.py 2018-10-02 10:51:52 +05:30