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

16280 commits

This branch
This branch
All branches
Author SHA1 Message Date
Shridhar Patil
abd3333bae Token based authentication (#5752) 
* token based authentication

* authentication

Basic base64encode(api_key:api_secret)
token api_key:api_secret

* test added

Validation: only user with system manager can generate the keys

* codacy issues fixed

* token based authentication

* authentication

Basic base64encode(api_key:api_secret)
token api_key:api_secret

* test added

Validation: only user with system manager can generate the keys

* codacy issues fixed

* use frappe.safe_encode

* base64 encode use frappe.safe_encode

* set frappe.local.form_dict after setting user

* removed test

* removed unused imports

* test for python 3

* Update user.js

* [user.py] throw correct error

* Update user.py
 2018-07-23 11:06:29 +05:30
Rushabh Mehta
b6ba3915a6 [minor] test fix 2018-07-23 11:06:27 +05:30
Mohamed_Alsum
803f6b0c7b allow null when time field is not required (#5832) 
* allow null when time field is not required

* Update base_document.py
 2018-07-23 10:36:42 +05:30
schilgod
6a06e65d20 remove duplicate field entry for fieldname two_factor_authentication (#5846) 2018-07-23 10:35:51 +05:30
Faris Ansari
f870a0bd25
Query Report (#5845) 
* Query Report

- Use report formatter if exists

* missing semicolon
 2018-07-20 17:19:00 +05:30
Prateeksha Singh
6f908b3443 Modules dropdown (#5767) 
* [modules-dropdown] init

* [modules-sidebar] setup structure

* [modules-sidebar] add chunks to group

* [modules-dropdown] ellipsis

* [move] help menu to explore menu

* merge help column to modules

* [modules-dropdown] get explore links from hooks

* [add] explore_link secondary

* [modules-dropdown] Places list

* [modules-dropdown] deprecate desk link, make icon dropdown

* [modules-dropdown] collapsible help menu

* [remove] global navbar icon style

* [boot] define core modules, use in dropdown

* [modules-dropdown] code style fixes
 2018-07-19 18:06:37 +05:30
Prateeksha Singh
d38e5d51ad
Merge pull request #5841 from pratu16x7/help-fixes 
[fix][help] image links
 2018-07-19 14:52:43 +05:30
Prateeksha Singh
ac6f938cd9 [fix][help] image links 2018-07-19 14:50:55 +05:30
Rushabh Mehta
a62e783bc0 [fix] webform for list 2018-07-19 14:24:51 +05:30
Saurabh
6b0faa74f2
Merge pull request #5840 from saurabh6790/staging_version_1 
Update staging version to support semantic versioning
 2018-07-19 13:39:04 +05:30
Saurabh
96a15617dc Update staging version to support symentic versioning 2018-07-19 13:37:31 +05:30
Saurabh
aa83c64b5a [fix] resolved merge conflicts 2018-07-19 13:34:10 +05:30
Saurabh
b9fffc9914 Merge branch 'hotfix' 2018-07-19 13:33:07 +05:30
Saurabh
d53a5c04b0 bumped to version 10.1.42 2018-07-19 14:03:07 +06:00
Prateeksha Singh
f566850728
[help] revert assets path, fix broken images 2018-07-19 13:10:34 +05:30
Charles-Henri Decultot
8fc2af64ad Allow custom confirmation page (#5835) 2018-07-19 12:50:35 +05:30
Rushabh Mehta
8cb936db86 [fix] potential fix for auto-scrolling issues 2018-07-19 12:24:03 +05:30
Rushabh Mehta
47a9c05b72 [fix] for webform css 2018-07-19 12:15:34 +05:30
Prateeksha Singh
ec7858fc1e
Merge pull request #5839 from KanchanChauhan/timeline-fix 
[Bug fix] Timeline had from and to reversed
 2018-07-19 11:58:43 +05:30
Nabin Hait
5b6786f372 Merge branch 'master' into develop 2018-07-19 11:14:21 +05:30
Nabin Hait
cd6c41546e Merge branch 'hotfix' 2018-07-19 11:14:20 +05:30
Nabin Hait
5ddbe495c1 bumped to version 10.1.41 2018-07-19 11:44:20 +06:00
Kanchan Chauhan
8cd6545bfe [Bug fix] Timeline had from and to reversed 2018-07-19 10:58:47 +05:30
Saurabh
bff5e1126a
Merge pull request #5838 from rohitwaghchaure/not_able_to_login 
[Fix] Not able to login
 2018-07-19 10:10:16 +05:30
Rohit Waghchaure
53154c3971 [Fix] Not able to login 2018-07-19 09:44:24 +05:30
Saurabh
176f3b6a15 Resolved merge conflicts 2018-07-18 16:20:06 +05:30
Saurabh
f0504b5b15 Merge branch 'hotfix' 2018-07-18 16:06:37 +05:30
Saurabh
6033e1e929 bumped to version 10.1.40 2018-07-18 16:36:37 +06:00
Faris Ansari
09735e9f3e Query Report: deprecated query_report_filters_by_name (#5834) 
* QueryReport

- Remove set_filters_by_name
- Remove save_user_settings
- Only print visible columns

* Query Report

- Deprecate frappe.query_report_filters_by_name
- New API: get_filter_value and set_filter_value
in frappe.query_report object
- Replace instances of old API with new API

* Undo changes in query_report.py
 2018-07-18 09:28:36 +05:30
Rushabh Mehta
be61b74c2a [minor] remove check from update password, default dropbox broker 2018-07-17 18:14:57 +05:30
Prateeksha Singh
e102e79e8d
Merge pull request #5833 from pratu16x7/report-fixes 
[fix][report] filters_by_name initialization
 2018-07-17 16:04:37 +05:30
Prateeksha Singh
c9228edcfc [fix][report] filters_by_name initialization 2018-07-17 16:02:52 +05:30
Ameya Shenoy
397a0b624c
Merge pull request #5831 from pratu16x7/report-fixes 
[fix][report] use frappe.db.set_value() instead of property saving
 2018-07-17 13:20:49 +05:30
Prateeksha Singh
b517bb21df [report] use frappe.db.set_value() instead of property saving 2018-07-17 13:17:26 +05:30
Zarrar
0d9d2c6142 reload custom_docperm prior to changes in docperm and drop column (#5830) 2018-07-17 11:30:25 +05:30
Charles-Henri Decultot
b175ac407f Possibility to go to file manager from sidebard (#5816) 
* Possibility to go to file from sidebard

* Refactor to use microtemplating
 2018-07-16 18:04:12 +05:30
Saurabh
c9b36c63dd Auto repeat fixes (#5819) 
* add index on next_schedule_date

* optiization and ux fixes

* minor fix

* Add index via DocType
 2018-07-16 18:02:08 +05:30
Saurabh
209c889cec Add beta version parameter for beta release (#5805) 
* Add beta version parameter for beta release

* rename beta to staging

* Update hooks.py
 2018-07-16 18:01:31 +05:30
ashish-greycube
814d7ed870 Update sms_settings.py (#5812) 
In context to https://github.com/frappe/frappe/issues/5811
 2018-07-16 18:00:54 +05:30
Shreya Shah
4b75e5b16e Fix comment mentions (#5820) 
* Show names for mentions instead of usernames

* Modify regex to allow email ids as mentions

* Modify get_value to fetch recipients based on names

* Add test case for regex
 2018-07-16 17:58:01 +05:30
aherbhagya
201b193c62 An added checkbox in Dropbox setting for file upload (#5753) 
* Added Custom check box for file upload

* removed half test file

* deleted test files

* deleted test files

* added patch to enable file backup in dropbox settings

* added patch to enable file backup in dropbox settings

* Update set_dropbox_file_backup.py

* Update set_dropbox_file_backup.py
 2018-07-16 17:47:38 +05:30
Suraj Shetty
36c1bc5e6f Check only read and export while creating docperm (#5823) 
- Uncheck everything else
 2018-07-16 17:45:37 +05:30
Zarrar
be38795f8d minor fix in use of reduce (#5825) 2018-07-16 17:41:29 +05:30
Prateeksha Singh
753d542f71
Merge pull request #5826 from pratu16x7/report-backup 
Background Reports
 2018-07-16 17:22:40 +05:30
Prateeksha Singh
bb450619c8 [prepared report] add prepared report condition to ignore in migrate 2018-07-16 17:05:00 +05:30
Prateeksha Singh
f3d9d6d22c [background-report] minor cleanup stage 4 2018-07-16 16:09:02 +05:30
shriharishastry
08cffe3bc7 [background-report] minor cleanup stage 3 2018-07-16 15:47:45 +05:30
shriharishastry
d51f030676 [background-report] minor cleanup stage 2 2018-07-16 15:45:54 +05:30
shriharishastry
0a68539c47 [background-report] minor cleanup 2018-07-16 15:43:40 +05:30
shriharishastry
e0eb3071d9 codacy changes 2018-07-16 15:38:55 +05:30