mbauskar
29c4622fa0
Merge branch 'develop' into staging
2017-07-26 18:00:00 +05:30
Prateeksha Singh
d94d992337
[fix][img-control] detach wrapper after inserting ( #3794 )
2017-07-26 17:50:49 +05:30
omkarghaisas
fad9c91cfe
Added mobile number in edit user profile web form ( #3766 )
...
updated mobile number is required to login using mobile number
2017-07-26 11:52:21 +05:30
Prateeksha Singh
c2f18dd9e4
[fix] detach instead of emptying parent ( #3783 )
2017-07-26 11:50:22 +05:30
Saurabh
9174b245d8
Merge branch 'staging'
2017-07-25 16:39:57 +05:30
Saurabh
9b4d8ad8a8
Merge branch 'master' into develop
2017-07-25 16:39:57 +05:30
Saurabh
f26695cdba
bumped to version 8.6.0
2017-07-25 17:09:56 +06:00
Saurabh
8eba852a13
Merge branch 'hotfix'
2017-07-25 15:58:28 +05:30
Saurabh
ae8d26760b
Merge branch 'master' into develop
2017-07-25 15:58:28 +05:30
Saurabh
7429ad573f
Merge branch 'master' into staging
2017-07-25 15:58:28 +05:30
Saurabh
2b48e5206a
bumped to version 8.5.8
2017-07-25 16:28:28 +06:00
Manas Solanki
68c09b9a75
[hot] fix in the data import ( #3780 )
...
* convert numbers to basestring for link field
* fix for link and dynamic link only
2017-07-25 14:20:48 +05:30
Utkarsh Yadav
877f8e2a23
[UI Test] Kanban view ( #3777 )
...
* added changes and one test for column
* changes in tests for new test runner
* codacy fixes
2017-07-25 12:05:18 +05:30
Faris Ansari
1fde846272
Form Timeline styling ( #3778 )
...
* Left align Indicator and corrected “Add to Knowledge Base” button misalignment.
* Left align Indicator and corrected “Add to Knowledge Base” button misalignment.
* Pushing title changes only, reverted timeline changes.
* Pushing title changes only, reverted timeline changes.
* Timelime tilte design update for small resolution.
* Review changes and added minified date
* Review changes for Timeline for smaller screen.
* Changes for tilte, delete icon change and removed duplicate date.
* Review changes
* Fixed Alignment for action buttons.
* Small resolution alignment changes.
* Class name changes.
* Timelime tilte design update for small resolution.
* Changes for tilte, delete icon change and removed duplicate date.
2017-07-25 11:55:29 +05:30
Manas Solanki
6d35855a7b
Fix for dropbox settings ( #3749 )
2017-07-25 11:25:28 +05:30
Frappe PR Bot
cbd257f0ba
[Translation] Updated Translations ( #3769 )
2017-07-25 11:19:46 +05:30
bcornwellmott
23d073adb7
Added tag search ( #3759 )
...
* Added tag search
* Added permissions check for document
2017-07-25 11:19:22 +05:30
Manas Solanki
50bfdb74f8
[hotfix] convert number format to basestring before importing. ( #3767 )
...
* convert numbers to basestring for link field
* Update importer.py
2017-07-25 11:18:30 +05:30
Prateeksha Singh
05a542d7cc
Set image control alignment via df ( #3754 )
...
* image control alignment via df
* [wiz] remove application brand name
2017-07-25 10:59:39 +05:30
Faris Ansari
3dfdbb4230
Set date according to system timezone ( #3770 )
...
- Show timezone as description if different from
system timezone
- cleanup datetime.js
2017-07-25 10:58:36 +05:30
Prateeksha Singh
e540eabdd0
[fix] notif translations fixes frappe/erpnext#10054 ( #3773 )
2017-07-25 10:55:28 +05:30
Faris Ansari
1549b9aa77
Font size 12px ( #3771 )
2017-07-25 10:55:01 +05:30
ckosiegbu
2ad495ea27
Added ability for either Administrator or user to reset the OTP secret. A user that is not Administrator can only reset their own OTP secret. Administrator can reset OTP secret of any user.
2017-07-25 02:09:25 +01:00
Rushabh Mehta
42e085ca4c
[refactor] control.js set_disp_area ( #3699 )
2017-07-24 11:42:34 +05:30
Britlog
998e207a34
Show footer on login page ( #3762 )
2017-07-24 11:41:18 +05:30
tundebabzy
993692ba32
Issue changing 'Unique' field option in v8 ( #3760 )
...
* fix wrong query
* test unique constraint removal
2017-07-24 11:27:59 +05:30
Revant Nandgaonkar
0fa951f893
Oauth2 tests ( #3756 )
...
* Test for oauth2 test_authorize_guest_redirect
* fix test oauth2
* [Fix] using py requests instead of werkzeug test client
* [Fix] https://www.codacy.com/app/frappe/frappe/pullRequest?prid=788942
* Test OAuth 2 Authorization Code Bearer Token flow
* [Fix] https://www.codacy.com/app/frappe/frappe/pullRequest?prid=788942
2017-07-24 11:25:05 +05:30
Prateeksha Singh
269c10ff12
[minor] fix goal label position ( #3755 )
2017-07-24 11:23:49 +05:30
ckosiegbu
97c6d74789
Updates to System Settings and login.js to allow for specification of the name of the token issuer.
2017-07-23 02:16:12 +01:00
ckosiegbu
9b4f10c204
Fixed issue with SMS sending
2017-07-23 00:27:01 +01:00
ckosiegbu
b6e65030d8
Transfer of SMS Settings and SMS Parameter to Frappe from ERPNext. Triggered by the need for SMS Sending by the Two-Factor Authentication functionality contributed by Manqala
2017-07-22 23:29:00 +01:00
ckosiegbu
3329618a14
Merge branch 'develop' into twofactor
2017-07-22 19:05:18 +01:00
crossxcell99
6f4e39fd46
fix Email otp method queue email sending
2017-07-21 17:50:31 +01:00
crossxcell99
aa45ffcac6
fix website user login bug refactor JS
2017-07-21 14:32:04 +01:00
Faris Ansari
14171bdc72
Setup filterable only once ( #3753 )
2017-07-21 16:10:34 +05:30
Rushabh Mehta
54181843a8
[fix] [hot] timeline.js ( #3752 )
2017-07-21 12:38:54 +05:30
Manas Solanki
81133888a8
[fix] add the parsed email id for the email group member ( #3741 )
...
* add the parsed email id of the email group member
* Minor fixe in the patch
2017-07-21 11:05:54 +05:30
felixvarghese
f189829240
Allow SSL connections to a remote database server ( #3742 )
...
* Allow SSL connections to a remote database server
Add the following options in site_config.json to use ssl
- "db_ssl_ca" = "/path/to/ca/cert.pem"
- "db_ssl_cert" = "/path/to/ssl/cert.pem"
- "db_ssl_key" = "/path/to/ssl/key.pem"
The files mentioned should be stored on the App server in the location mentioned.
This commit allows for basic ssl connections. X509 is still not supported.
If the above options are not set, the connection will not use an encrypted connection, and connect normally.
* docs - Allow SSL to remote database host
2017-07-20 18:00:02 +05:30
Faris Ansari
5a498616b6
Email header ( #3748 )
...
* Fix fonts for emails
* Email header with indicator
* Login emails with header
* Add tests for email header
* fix codacy
2017-07-20 17:57:57 +05:30
mbauskar
553b30593d
Merge branch 'hotfix'
2017-07-20 16:48:55 +05:30
mbauskar
0dd91f4fef
Merge branch 'master' into develop
2017-07-20 16:48:55 +05:30
mbauskar
7f8125e273
bumped to version 8.5.7
2017-07-20 17:18:55 +06:00
Rushabh Mehta
c3598c2521
[minor] setup wizard fixes
2017-07-20 15:54:34 +05:30
Rushabh Mehta
ebbad93d26
[minor] allow tests with longer timeout
2017-07-20 15:14:27 +05:30
Rushabh Mehta
db6743cf3c
[minor] allow tests with longer timeout
2017-07-20 15:14:27 +05:30
mbauskar
e4204e9dc5
Merge branch 'hotfix'
2017-07-20 14:16:01 +05:30
mbauskar
d674a69ba6
Merge branch 'master' into develop
2017-07-20 14:16:01 +05:30
mbauskar
497103de25
bumped to version 8.5.6
2017-07-20 14:46:01 +06:00
Nabin Hait
124a326ae8
Fixed ajax count after server request failed ( #3746 )
2017-07-20 11:39:18 +05:30
Prateeksha Singh
680809acf8
[versioning] check for empty field values ( #3739 )
...
* [versioning] check for empty field values
* [test] get_diff for changes across docs
2017-07-20 11:00:09 +05:30
