Commit Graph
100 Commits
Author SHA1 Message Date
mdipierro 6f2e8de998 Merge pull request #841 from kirsn/master
Issue 794: sep = separator or current.response.form_label_separator
2015-03-11 18:28:55 -05:00
mdipierro a5e4cbeaf7 Merge pull request #840 from BuhtigithuB/pep8-globals-py
Improve PEP8 globals.py
2015-03-11 18:28:40 -05:00
mdipierro 8ac3f204fa inverted messages 2015-03-11 00:53:19 -05:00
mdipierro 9b3a9a32e4 reduced space in forms 2015-03-11 00:42:01 -05:00
mdipierro 71aac68c20 fixed whitespaces in welcome3 2015-03-11 00:35:24 -05:00
mdipierro ae48f471d0 minor flash styling 2015-03-11 00:23:43 -05:00
mdipierro d4ebb5462b simpled code in index.html 2015-03-11 00:12:54 -05:00
mdipierro 3e3fdbd06a image header only on index 2015-03-10 23:58:44 -05:00
mdipierro 915c5a71d8 bold buttons, no shadow 2015-03-10 23:56:34 -05:00
mdipierro 62fa6a8a78 example of image 2015-03-10 23:44:46 -05:00
mdipierro 664a59f46c minor simplifications 2015-03-10 23:11:04 -05:00
mdipierro 3948132817 better bootstrap3 2015-03-10 23:07:00 -05:00
mdipierro a2060eedce improved static/js/web2py-bootstrap3.js 2015-03-10 22:18:42 -05:00
mdipierro ac24ce446e minor changes to welcome3 2015-03-10 13:47:53 -05:00
mdipierro 46e0dcebf2 welcome3 2015-03-10 13:42:58 -05:00
mdipierro 3f9f8db62c another README revision 2015-03-09 12:56:29 -05:00
mdipierro 219fb3e9cc another README revision 2015-03-09 12:55:10 -05:00
mdipierro 037d652b0b listed packages under README 2015-03-09 12:28:10 -05:00
mdipierro 4d6c9f62f0 fixed typo in readme 2015-03-09 12:10:47 -05:00
mdipierro 0f300cf845 fixed readme 2015-03-09 11:57:09 -05:00
mdipierro 0c60f05e62 Merge pull request #839 from BuhtigithuB/pep8fileutils-py
PEP8 fileutils py
2015-03-07 12:34:19 -06:00
mdipierro b00a16ffa3 added some more consulting companies 2015-03-06 11:32:49 -06:00
mdipierro a5145340fb Merge pull request #831 from niphlod/fix/827
fix docs at the top to honor correctly expiration when used in models
2015-03-05 16:26:45 -06:00
mdipierro bbb47ba075 Merge pull request #830 from BuhtigithuB/master
Fix click popagation to both new and actual tab when CTRL+Click
2015-03-05 16:26:36 -06:00
mdipierro 262c99ce33 Merge pull request #828 from niphlod/fix/656
fixes #656
2015-03-05 16:26:03 -06:00
mdipierro 91873f9ed4 Merge branch 'gi0baro-master' 2015-03-05 16:25:31 -06:00
mdipierro 0f5a59627b Merge branch 'master' of https://github.com/gi0baro/web2py into gi0baro-master 2015-03-05 16:25:19 -06:00
mdipierro 4168002a58 allow imports form gluon/dal.py 2015-03-03 11:05:13 -06:00
mdipierro befb5b286a Merge branch 'master' of github.com:web2py/web2py 2015-03-01 11:04:53 -06:00
mdipierro 5bed152a0d email cid on GAE 2015-03-01 11:04:37 -06:00
mdipierro 9ee8fe25fe Merge pull request #821 from leonelcamara/Fix_issue_#819
Fixed issue 819
2015-02-25 11:45:06 -06:00
mdipierro 089e632aab Merge pull request #818 from leonelcamara/fix_sheduler_task_args
Fix - Scheduler - Convert task args back to utf-8
2015-02-25 11:44:46 -06:00
mdipierro 99cc5750bc Merge pull request #817 from niphlod/fix/773
fixes issue #773
2015-02-25 11:44:30 -06:00
mdipierro 7bd1d4b57f Merge pull request #816 from ilvalle/fix-editor
fix issue 799, removed new lines from response header
2015-02-25 11:44:12 -06:00
mdipierro 942b56fdc8 Merge pull request #812 from niphlod/fix/635
fixes issue #635
2015-02-24 09:26:40 -06:00
mdipierro dbd5bf0be6 Merge pull request #811 from niphlod/update/ipaddr
updated ipaddr to the latest version
2015-02-24 09:26:21 -06:00
mdipierro bd180c18d2 Merge pull request #810 from niphlod/fix/742
fixes issue #742
2015-02-24 09:26:03 -06:00
mdipierro a37c90d957 Merge pull request #809 from niphlod/fix/806
fixes #806
2015-02-24 09:25:43 -06:00
mdipierro b402d2a03f Merge pull request #808 from ilvalle/codemirror-4.13
codemirror 4.13
2015-02-24 09:25:29 -06:00
mdipierro a4f181ff8e Merge pull request #807 from sven/master
Make extract_sqlite_models.py work with SQLite 3.8.6
2015-02-24 09:25:09 -06:00
mdipierro 8d83bb3076 Merge pull request #804 from niphlod/fix/sessions2trash
fixed sessions2trash.py not removing empty dirs
2015-02-20 08:38:27 -06:00
mdipierro 41cfb1829a Merge pull request #802 from Pivert/issue/801
Issue/801 - Fix the :write not saving problem in codemirror vim mode
2015-02-20 08:37:55 -06:00
mdipierro defe76d947 Merge pull request #797 from mcemeren/master
Fixed issue;sanitizer closing no close tags
2015-02-20 08:37:35 -06:00
mdipierro 4e019fe6fd added missing codemirror file 2015-02-18 11:02:36 -06:00
mdipierro c2a46c5d6d web2py.py -e 2015-02-18 10:29:20 -06:00
mdipierro 8a9d95de41 fixed 'Return object from represent method of field' 2015-02-17 12:01:36 -06:00
mdipierro d6c565f33f fix HIGHEST PROTOCOL? 2015-02-15 23:35:15 -06:00
mdipierro e90433c116 no more handlers in binaries 2015-02-15 17:02:47 -06:00
mdipierro b8ce120a8e Merge pull request #792 from niphlod/fix/735
fixes #735. Review CAREFULLY before merging
2015-02-15 16:44:09 -06:00
mdipierro 1c431909bf Merge pull request #796 from niphlod/fix/docs
adjusted docs to newer structure
2015-02-15 16:43:03 -06:00
mdipierro 65bfd4094e Merge pull request #795 from ilvalle/codemirror-4.12
removed unsed codemirror files
2015-02-15 16:42:57 -06:00
mdipierro 8139b65152 updated list of supporting companies 2015-02-15 16:16:15 -06:00
mdipierro c59504067b fixed some text 2015-02-15 15:29:40 -06:00
mdipierro 6af4c283cc no more reference to googlecode 2015-02-15 15:24:30 -06:00
mdipierro b22aa355d0 better Makefile 2015-02-14 00:10:25 -06:00
mdipierro 613c509d96 better Makefile 2015-02-14 00:07:02 -06:00
mdipierro e00fcc7979 better Makefile 2015-02-13 23:59:46 -06:00
mdipierro a3cbfb602c no more epydoc 2015-02-13 23:31:12 -06:00
mdipierro 2ad7ee2544 improved Makefile 2015-02-13 23:30:30 -06:00
mdipierro c56c96ede1 cp --parents 2015-02-13 23:23:33 -06:00
mdipierro 2aa8eaccb0 Merge pull request #788 from ilvalle/admin-fix-inspect
Fix appadmin code inspection for db hooks
2015-02-09 16:56:30 -06:00
mdipierro 47b3e46510 Merge pull request #781 from Pivert/update/codemirror_4.12
Update/codemirror 4.12
2015-02-09 16:56:09 -06:00
mdipierro c02d9fe665 Merge pull request #780 from Pivert/issue/2046
Fixed issue/2046:
2015-02-09 16:55:03 -06:00
mdipierro 73cdda20e6 Merge pull request #777 from niphlod/fix/pg8000_import
this somehow got merged wrongly (came from #762)
2015-02-09 16:54:51 -06:00
mdipierro 0d9f61eeab Merge pull request #775 from leonelcamara/fix_enableElement
Fix enable element
2015-02-09 16:52:57 -06:00
mdipierro 69c2bfba9a Merge pull request #774 from niphlod/fix/issue_769
fixes #769
2015-02-05 18:09:50 -06:00
mdipierro 7e22309844 Merge pull request #768 from niphlod/enhancement/sqlhtml
pep8ized a taddle bit sqlhtml.py
2015-02-05 18:09:34 -06:00
mdipierro 0da70c9552 Merge pull request #765 from niphlod/enhancement/tests_with_travis_docker
exploiting new travis-ci environment
2015-02-05 18:09:24 -06:00
mdipierro 407fc85dc5 Merge pull request #763 from niphlod/fix/README
fixed issue report link
2015-02-05 18:09:07 -06:00
mdipierro 4984892fe0 merged 2015-02-05 18:08:35 -06:00
mdipierro d98d0872b3 Merge pull request #761 from gi0baro/master
Updated missing pydal warning message
2015-02-05 17:58:04 -06:00
mdipierro 0c1c36e022 Merge pull request #758 from niphlod/fix/safer_adapters_import
we should always avoid importing "optionals" without a try:except.
2015-02-05 17:57:45 -06:00
mdipierro 5da5d510a0 fixed some problems with new dal and SQLHTML 2015-01-27 00:16:45 -06:00
mdipierro 89c5668366 Merge branch 'master' of github.com:web2py/web2py 2015-01-26 09:22:47 -06:00
mdipierro 554722318a fixed a problem with SQLFORM and DAL import 2015-01-26 09:22:12 -06:00
mdipierro c18e32134c Merge pull request #600 from kirsn/master
Issue 2037: apply truncate correctly
2015-01-25 13:15:21 -06:00
mdipierro fa7e603a7a changed the text that reports missing mydal 2015-01-25 12:32:31 -06:00
mdipierro 5a0ee72260 Merge pull request #599 from gi0baro/pydal-sm
From DAL to pyDAL as git submodule
2015-01-25 12:13:08 -06:00
mdipierro 4a27ce1f57 Merge pull request #598 from dmatic/master
Script for centos7 now also installs 'unzip' package
2015-01-23 12:10:47 -06:00
mdipierro d00be02089 Merge pull request #597 from flavour/ST_SimplifyPreserveTopology
Add support for ST_SimplifyPreserveTopology
2015-01-23 12:10:18 -06:00
mdipierro bd8f2a93ba Merge pull request #596 from kirsn/master
Issue 2035: Fix the caching on Windows
2015-01-23 12:09:48 -06:00
mdipierro a2f5d1cfc5 Merge pull request #595 from kvar/master
DAL imports portalocker from gluon to avoid conflict with another portal...
2015-01-21 09:33:11 -06:00
mdipierro 137f6b9640 Merge pull request #594 from michele-comitini/fix_case_sensitivity_w_recover_password
auth.settings.*_case_sensitivity support for password retrieval
2015-01-21 09:32:34 -06:00
mdipierro 52d46c4bd5 Merge pull request #592 from leonelcamara/fix_appcleanup
Make app_cleanup use recursive_unlink to clean the cache folder. This fi...
2015-01-21 09:32:01 -06:00
mdipierro 5bc5d0496e R-2.9.12 2015-01-17 00:07:10 -06:00
mdipierro fe34d78578 Merge pull request #591 from prasadmuley/issue2006_export_customize_query_defined_in_searchable
Fix: Exporting from a SQLFORM.grid with customized search queries
2015-01-16 13:06:26 -06:00
mdipierro f840cdae5f Merge pull request #590 from prasadmuley/issue2006_export_customize_query_defined_in_searchable
Fix: Exporting from a SQLFORM.grid with customized search queries
2015-01-16 08:51:58 -06:00
mdipierro b36c38cc88 Merge pull request #586 from ilvalle/test-auth
Initial tests for auth
2015-01-16 08:43:40 -06:00
mdipierro 0aa58c5f93 Merge branch 'master' of github.com:web2py/web2py 2015-01-15 10:18:32 -06:00
mdipierro c6cc06f6c0 fixed grid export with custom search, thanks Prasad Muley 2015-01-15 09:58:13 -06:00
mdipierro bda69b0e88 mail timeout 2015-01-15 09:47:57 -06:00
mdipierro 0cfbab6206 Merge pull request #589 from rif/patch-1
fix issuer comparison
2015-01-14 11:07:28 -06:00
mdipierro 385bcf6988 Merge pull request #588 from willimoa/enhancement/td_dal
Initial simple change for adding geospatial support to Teradata adaptor.
2015-01-14 11:06:38 -06:00
mdipierro 181546e49d fixed conflict 2015-01-12 21:16:03 -06:00
mdipierro 57c5fb64f6 fixed issue 1978, thanks mbelletti 2015-01-12 21:00:49 -06:00
mdipierro 15bf3e2ede fixed issue 1991, thanks Mark 2015-01-12 20:53:28 -06:00
mdipierro b872cced33 fixed issue 2001, thanks Anthony 2015-01-12 20:39:14 -06:00
mdipierro 2af5e02c5f fixed issue #2032, thanks Paolo 2015-01-12 20:06:05 -06:00
mdipierro e9de0766bc Merge pull request #585 from ilvalle/issue2023
fix issue 2023: common_filter issue in _enable_record_versioning
2015-01-10 20:40:26 -06:00
mdipierro 9e555ed4b5 Merge pull request #584 from anssih/ndborder
GoogleSQLAdapter: Fix NDB orderby without limitby broken in 2.9.6
2015-01-10 20:36:46 -06:00