Commit graph

6239 commits

Author SHA1 Message Date
Pratik Vyas
648ec899c2 [minor] fix session db persistence 2014-10-17 09:23:13 +05:30
Pratik Vyas
0c6c559348 Merge branch 'develop' 2014-10-14 12:34:42 +05:30
Pratik Vyas
3b0cbc9be3 bumped to version 4.4.5 2014-10-14 13:04:42 +06:00
Pratik Vyas
383a1e9ef6 Merge pull request #882 from pdvyas/fix-mariadb
add my_config patch to travis
2014-10-12 19:39:49 +05:30
Pratik Vyas
4da75442d2 add my_config patch to travis 2014-10-12 18:54:44 +05:30
Pratik Vyas
62fc7996fb Update .travis.yml 2014-10-12 17:08:49 +05:30
Pratik Vyas
041a14a47b Update .travis.yml 2014-10-12 17:01:58 +05:30
Pratik Vyas
0c2f037f9a Pin python-mysql 2014-10-10 17:28:06 +05:30
Rushabh Mehta
2f9983b740 [fixes] frappe/erpnext#2279 2014-10-09 10:22:16 +05:30
Rushabh Mehta
461a4f7a5c Merge pull request #881 from anandpdoshi/anand-oct-8
Generator Route
2014-10-09 10:20:42 +05:30
Anand Doshi
9055bbd74e [fix] get_generator_route 2014-10-08 18:59:52 +05:30
Rushabh Mehta
3ac5c11f41 [minor] added class in navbar 2014-10-08 15:01:57 +05:30
Rushabh Mehta
5199187483 [translations] updated via translator 2014-10-08 14:14:58 +05:30
Rushabh Mehta
5ea8896b1a [fix] jinja 2014-10-08 14:09:21 +05:30
Rushabh Mehta
95f06c8288 Merge pull request #880 from anandpdoshi/anand-oct-8
[minor] precision field in framework.sql
2014-10-08 13:43:36 +05:30
Anand Doshi
1d6a2bb871 [minor] precision field in framework.sql 2014-10-08 13:21:28 +05:30
Pratik Vyas
bba206e65e Merge branch 'develop' 2014-10-07 17:04:45 +05:30
pdvyas
faa8361340 bumped to version 4.4.4 2014-10-07 17:34:45 +06:00
Nabin Hait
8ede85c62d Merge pull request #874 from rmehta/email-alert
[fixes] minor: email_alert, listview, doctype validation
2014-10-07 14:00:01 +05:30
Rushabh Mehta
f699c2d135 [fixes] minor: email_alert, listview, doctype validation 2014-10-07 10:40:57 +05:30
Rushabh Mehta
abb6efc3a0 [fix] statics 2014-09-29 16:49:33 +05:30
Rushabh Mehta
f98d55b41b Merge pull request #869 from rmehta/fix-statics
[fix] statics
2014-09-29 16:46:38 +05:30
Rushabh Mehta
646842c67d [fix] statics 2014-09-29 16:45:35 +05:30
Rushabh Mehta
d519115a66 Merge pull request #868 from rmehta/fix-statics
[fix] statics
2014-09-29 16:42:39 +05:30
Rushabh Mehta
04efaf65e3 [fix] statics 2014-09-29 16:41:45 +05:30
Pratik Vyas
f4f4462c27 Merge branch 'develop' 2014-09-29 15:39:05 +05:30
Pratik Vyas
f31c17ee23 bumped to version 4.4.3 2014-09-29 16:09:05 +06:00
Rushabh Mehta
08301dca84 Merge pull request #864 from rmehta/fix-linked-with-perms
[fix] linked_with ignore if no permissions
2014-09-29 12:36:48 +05:30
Rushabh Mehta
d61437f743 Merge pull request #863 from anandpdoshi/anand-september-26
[minor] Unicode issue in quote url
2014-09-29 12:36:40 +05:30
Rushabh Mehta
654f55f5a1 [fix] linked_with ignore if no permissions 2014-09-27 11:27:01 +05:30
Anand Doshi
08d94920f6 [minor] Unicode issue in quote url 2014-09-26 18:04:18 +05:30
Pratik Vyas
e1089d1f2d Merge branch 'develop' 2014-09-26 16:49:23 +05:30
Pratik Vyas
885c79a851 bumped to version 4.4.2 2014-09-26 17:19:23 +06:00
Nabin Hait
2ced811ec5 Merge pull request #860 from anandpdoshi/anand-september-21
[minor] Page: write permission for System Manager
2014-09-26 16:26:30 +05:30
Rushabh Mehta
66f3eacec2 [comments] load 100 2014-09-24 22:08:04 +05:30
Anand Doshi
ca004acbb0 [minor] Page: write permission for System Manager 2014-09-21 19:43:25 +05:30
Pratik Vyas
16e2897d4f Merge branch 'develop' 2014-09-17 21:31:05 +05:30
Pratik Vyas
34ce279e26 bumped to version 4.4.1 2014-09-17 22:01:05 +06:00
Rushabh Mehta
d568441540 [hotfix] #848 2014-09-17 11:21:02 +05:30
Rushabh Mehta
627cd4cb4b Merge pull request #853 from anandpdoshi/anand-september-16
[fix] on route change, set max width for containers to 970px except for
2014-09-17 11:08:41 +05:30
Anand Doshi
99eda53ce5 [fix] on page change, set full-width for containers if explicitly specified
else limit width to 970px
2014-09-16 22:33:46 +05:30
Pratik Vyas
00ae80134f Merge branch 'develop' 2014-09-16 15:56:25 +05:30
Pratik Vyas
d65aea390f bumped to version 4.4.0 2014-09-16 16:26:25 +06:00
Rushabh Mehta
777ae6d15d Update CONTRIBUTING.md 2014-09-16 15:21:20 +05:30
Anand Doshi
35de675256 Merge pull request #846 from anandpdoshi/anand-september-15
[minor] copy_doc ignore_no_copy
2014-09-16 15:16:12 +05:30
Anand Doshi
dddaf2285a Merge pull request #852 from anandpdoshi/anand-september-16
[minor] clear _website_pages in clear_web
2014-09-16 15:16:06 +05:30
Anand Doshi
be93bbc76a [minor] clear _website_pages in clear_web 2014-09-16 15:08:27 +05:30
Anand Doshi
140a299daf [hotfix] mysqldb encoders for UnicodeWithAttrs of markdown2 2014-09-15 16:26:01 +05:30
Anand Doshi
b201bae900 [minor] copy_doc ignore_no_copy 2014-09-15 12:51:01 +05:30
Nabin Hait
88bcc4cabe Merge pull request #843 from nabinhait/hotfix
minor fix
2014-09-12 17:01:09 +05:30