Commit graph

13149 commits

Author SHA1 Message Date
Rushabh Mehta
df66dfe941 [fix] render.py for home 2017-07-28 15:16:24 +05:30
Rushabh Mehta
50d06d1202 [minor] sitemap.xml is also programmable 2017-07-28 14:42:14 +05:30
Rushabh Mehta
f609a478ae [refactor] user permissions (#3713)
* [refactor] user permissions

* [fix] tests

* [ux] user-permissions

* [minor] cleanup system settings

* [minor] end progress
2017-07-28 14:33:31 +05:30
Rushabh Mehta
c519122929 [docs] Build docs in an app (#3796)
* [docs] to be rendered in website

* [docs] generating-docs.md

* [fix] codacy

* [docs] minor updates

* [fix] routing
2017-07-28 11:43:16 +05:30
Rushabh Mehta
9214e0f7fc [fix] flake8 verison 2017-07-28 11:35:25 +05:30
Rushabh Mehta
5fcd0255f9 [fix] subject 2017-07-28 11:25:53 +05:30
Prateeksha Singh
7fa8148d33 Graph additions (#3776)
* remove hardcoded height and width

* [graph] relative measures, offsets, generalise all base jobs

* Multiple datasets! (individually colored)

* [graph] Tooltips

* [graph] animate and change values

* [graph] percentage graph

* [graph] custom height, window resize refresh

* [graph] style changes

* [graph] update docs

* [graphs] make graphs.less

* [graphs] prefix classes with 'graph-', nest inside parent class
2017-07-28 11:14:33 +05:30
Saurabh
d384722839 Merge branch 'master' into develop 2017-07-27 17:59:19 +05:30
Saurabh
a7fd1691f8 Merge branch 'hotfix' 2017-07-27 17:59:18 +05:30
Saurabh
2389f46411 bumped to version 8.6.2 2017-07-27 18:29:18 +06:00
Faris Ansari
e7790b36d2 Rich Text Comment Area (#3789)
* first cut

* frappe.ui.CommentArea

* working commit

* enable airmode

* Styling fixes

* Add emoji support in comment

* editing wip

* Fixed editing area
2017-07-27 17:52:51 +05:30
Faris Ansari
3f93565553 Email designs (#3786)
* New message email

* Mentioned in a comment

* File backup email

* Feedback email

* Administrator logged in email

* Upcoming events email

* minor

* Add header title and indicator color
2017-07-27 17:51:20 +05:30
Rushabh Mehta
a0aa9a2079 [fix] callback for ajax (#3802)
* [fix] callback for ajax

* [fix] ajaxSend instead of ajaxStart
2017-07-27 17:49:01 +05:30
Utkarsh Goswami
be60a22365 [UI Test Report] Test for Query Report (#3801)
* Updated Test for Query Report

* Correct path updated
2017-07-27 17:44:54 +05:30
mbauskar
3c0e8b2ed3 Merge branch 'hotfix' 2017-07-27 12:17:21 +05:30
mbauskar
3f70754e11 Merge branch 'master' into develop 2017-07-27 12:17:21 +05:30
mbauskar
ac3e361ecf bumped to version 8.6.1 2017-07-27 12:47:20 +06:00
Makarand Bauskar
22475a046c [hotfix] encode the email message to utf8 before sending mail (#3785)
* [hotfix] encode the email message to utf8 before sending mail

* [minor] review fixes
2017-07-27 12:14:37 +05:30
Rushabh Mehta
aef98daae4 [add] catch errors flake8 (#3800) 2017-07-27 11:34:44 +05:30
Faris Ansari
1332710982 Email footer (#3784)
* Add frappe.preview_email for faster feedback on email design

* Set Unsubscribe link color to text-muted

* error handling for header

* codacy fixes
2017-07-27 11:33:31 +05:30
omkarghaisas
d56fbaba41 Third party apps portal (#3782)
* Added third party apps portal page stub

* [WIP] third party apps portal page

* Added portal page third party apps

Added page to manage OAuth 2.0 active sessions

* [Fix] Typo me.html

* frappe/www/third_party_apps.

* [Fix] Added column for last log in
2017-07-27 11:32:40 +05:30
bcornwellmott
377f233ca4 Allow workflow state and status in listview (#3757)
* Allow workflow state and status in listview

* Clear trailing blankspace

* Fixed bug when missing override_status

* Commonized duplicate code
2017-07-27 11:24:50 +05:30
Nabin Hait
ff248fd4fa Pass if unable to handle failed ajax response (#3797) 2017-07-27 11:21:15 +05:30
Rushabh Mehta
25dcdd2462 [minor] add clear in msgpring 2017-07-27 10:39:26 +05:30
Rushabh Mehta
bc8044c4e0 [fix] no breadcrumbs in update-password 2017-07-27 10:39:26 +05:30
Makarand Bauskar
a66845036b [minor] revert enable all roles (#3790) 2017-07-27 09:01:48 +05:30
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
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