Commit Graph
7058 Commits
Author SHA1 Message Date
Vinyl Darkscratch 90ee6f3754 Add three-quote support on markmin 2016-11-11 15:51:01 -08:00
Vinyl Darkscratch d51ea90e18 Code fix to allow adding markmin translations
Playing with this file made me realize that the quotes defining the
strings themselves are added to the regex searches, and that my
previous addition caused invalid syntax.  So, I decided to fix this by
placing the first quote before the markmin decorator.  (Triple quotes
won’t work, however…)
2016-11-11 15:49:28 -08:00
Vinyl Darkscratch 3fed558bdd Merge remote-tracking branch 'web2py/master' into translations 2016-11-11 15:44:21 -08:00
Michele ComitiniandGitHub 4ea31820aa Merge pull request #1520 from michele-comitini/wrong_serializers_import
fix wrong import in default controller of admin app
2016-11-03 12:00:15 +01:00
Michele Comitini 8e1630843a fix wrong import in default controller of admin app 2016-11-02 00:41:40 +01:00
mdipierroandGitHub 6d38aa7a3d Merge pull request #1507 from vinyldarkscratch/master
Fire event after web2py component completed (Enhancement)
2016-10-22 10:14:43 -05:00
Vinyl Darkscratch 7615848f83 Add a fired event after the component has finished loading
Sometimes we may want to know when the component is finished with it’s
loading process entirely to trigger animations or something similar.  I
added this for my own website, and I think that others may want to use
this.  It’s a small addition, but I hope that it will be helpful to
others!
2016-10-18 18:27:37 -07:00
Vinyl Darkscratch 3ad052de26 Merge remote-tracking branch 'web2py/master' 2016-10-18 18:19:55 -07:00
mdipierroandGitHub 77dfec9e4d Merge pull request #1504 from vinyldarkscratch/master
Updated and functional version of #1420
2016-10-14 10:12:36 -05:00
mdipierroandGitHub 77968b5034 Merge pull request #1502 from matclab/issue_1500
Allow cookie to contains several '='
2016-10-14 10:12:05 -05:00
mdipierroandGitHub f9a41875e6 Merge pull request #1499 from ilvalle/fix-app-admin
fix few app admin py3 issues, updated qdb (close #1471)
2016-10-14 10:11:36 -05:00
mdipierroandGitHub bc7232456e Merge pull request #1498 from niphlod/fix/1491
fixes #1491
2016-10-14 10:10:16 -05:00
mdipierroandGitHub d15d0e69cc Merge pull request #1497 from niphlod/fix/1489
fixes #1489
2016-10-14 10:09:25 -05:00
mdipierroandGitHub 94d449630d Merge pull request #1496 from niphlod/fix/1493
fixes #1493 (at @abastardi's bidding)
2016-10-14 10:09:05 -05:00
mdipierroandGitHub 8c252e99cb Merge pull request #1495 from niphlod/fix/appadmin_ccache
fix ccache page in appadmin, thanks MDSIII
2016-10-14 10:08:41 -05:00
mdipierroandGitHub df3524878d Merge pull request #1492 from BuhtigithuB/improve/make-pass-test-tools-py-login-bare
Make pass test_login_bare() and little other improvements
2016-10-14 10:08:20 -05:00
Vinyl Darkscratch 63c494c24d Fixed accidental module-to-import swap 2016-10-10 20:59:31 -07:00
Vinyl Darkscratch f8d62423e5 Update custom 503 page code to be less...idiotic 2016-10-10 20:53:21 -07:00
Vinyl Darkscratch a28b1e30c9 Merge remote-tracking branch 'web2py/master' 2016-10-10 20:49:54 -07:00
Vinyl Darkscratch 3e2b8f89aa Merge remote-tracking branch 'web2py/master' into translations 2016-10-10 20:45:42 -07:00
Mathieu Clabaut 3f96c521f3 Allow cookie to contains several '='
close #1500
2016-10-09 21:48:10 +02:00
ilvalle c1d81a8f60 fix few app admin py3 issues, updated qdb (close #1471) 2016-10-08 12:26:04 +02:00
niphlod 87489f3363 fixes #1491 2016-10-07 22:43:06 +02:00
niphlod 8efd0cb01f fixes #1489 2016-10-07 21:23:00 +02:00
niphlod 555f2ad040 fixes #1493 (at @abastardi's bidding) 2016-10-07 21:20:10 +02:00
niphlod 39e8cfb11a fix ccache page in appadmin, thanks MDSIII
fixes the ccache page to now raise an exception if a dict is stored in
cache
2016-10-07 21:14:56 +02:00
mdipierroandGitHub e6a3081b42 Merge pull request #1494 from niphlod/fix/appadmin
fix issue with regex
2016-10-07 11:17:45 -05:00
niphlodandGitHub 27ce91474d fix issue with regex 2016-10-07 13:10:44 +02:00
Richard Vézina 77c0384f79 Make pass test_login_bare() and little other improvements 2016-10-05 12:41:47 -04:00
mdipierroandGitHub 1877f49730 Merge pull request #1490 from niphlod/fix/1485
fixes #1485, thanks @abastardi once again
2016-10-04 19:40:11 -05:00
mdipierroandGitHub b8c1d39375 Merge pull request #1489 from niphlod/fix/appadmin
remove __pycache__ from the list of apps
2016-10-04 19:39:50 -05:00
mdipierro a9d3d31417 merged with niphlod 2016-10-03 17:42:39 -05:00
niphlod b9c1b4d62b fixes #1485, thanks @abastardi once again 2016-10-04 00:40:29 +02:00
niphlod a1c1d1357f remove __pycache__ from the list of apps
in case someone wonders how many core devs are actively using the admin
app...here's the evidence ^_^'
2016-10-04 00:30:11 +02:00
mdipierroandGitHub cf9b2d8fa0 Merge pull request #1487 from niphlod/fix/update_pg8000
updates pg8000 driver and freshens travis.yml
2016-10-03 17:27:03 -05:00
niphlod bcc237ead8 removing pycrypto hard dep 2016-10-04 00:11:54 +02:00
niphlod 15769857cb 1st trial 2016-10-03 22:16:55 +02:00
mdipierroandGitHub 4f68c418f8 Merge pull request #1486 from niphlod/fix/1484
fixes #1484, thanks @abastardi
2016-10-03 14:48:53 -05:00
mdipierroandGitHub 99c3e06589 Merge pull request #1483 from niphlod/fix/pymysql_local_imports
make pymysql usable inside web2py
2016-10-03 14:48:30 -05:00
niphlod b7219ba2fd fixes #1484, thanks @abastardi 2016-10-03 21:09:27 +02:00
niphlod 9256d67ec7 remove pymysql dependency 2016-10-01 11:25:52 +02:00
niphlod 9539cc7542 make pymysql usable inside web2py 2016-10-01 00:15:47 +02:00
mdipierroandGitHub d602631c7e Merge pull request #1480 from gi0baro/master
Updated pyDAL to 16.9
2016-09-30 17:15:25 -05:00
mdipierroandGitHub 92ca527426 Merge pull request #1481 from ilvalle/compileapp_refactor
minor compileapp refactor
2016-09-30 17:15:18 -05:00
mdipierroandGitHub 91b616d1cf Merge pull request #1482 from niphlod/fix/1407_and_T_v2
fixes #1407 passing a properly escaped string
2016-09-30 17:14:45 -05:00
mdipierro 590a505c54 upgraded PyMysql to 0.7.9, thanks niphlod 2016-09-30 16:02:40 -05:00
mdipierro a867a65ebe syncing pydal 16.09 2016-09-30 13:55:48 -05:00
mdipierro b19c3419ec do not cache normal views because of dependencies 2016-09-30 13:54:37 -05:00
mdipierro d03337a737 compile views with . separator anot _ seperator 2016-09-30 11:24:55 -05:00
mdipierro a1154a6f42 reverted 28db54d0e8 changes to compileapp.py 2016-09-30 09:59:08 -05:00