This repository was archived by the owner on Oct 29, 2025. It is now read-only.

Fix type inconsistency in sql - #91

Open

cmc333333 wants to merge 325 commits into

cfpb:masterfrom

cmc333333:postgres-type-error

This pull request is big! We're only showing the most recent 250 commits

Commits on Apr 8, 2014

Commits on Apr 9, 2014

Add comments and members properties for idea
dlapiduz
committed
52e8ba9
Send notifications when a new comment is created
dlapiduz
committed
05c14d3

Commits on Apr 10, 2014

Start to style challenge page
dlapiduz
committed
013e4e9
Change character limit to 200 on idea summary
dlapiduz
committed
f8e4cd2

Commits on Apr 14, 2014

IN-314 - Fix incorrect timestamps
m3brown
committed
4b2ae9f

Commits on Apr 15, 2014

Allow liking from listing pages
dlapiduz
committed
33aa8c7
Add p element and finishing br to notification email
dlapiduz
committed
ff90902
Remove voter field from forms, add migrations
m3brown
committed
f30eb2c
Merge pull request #1 from m3brown/pr19
dlapiduz
committed
09b62f5
Merge pull request #19 from dlapiduz/styling
m3brown
committed
5896a7a
Update homepage to reflect design prototype
m3brown
committed
289dbd7
IN-463 - Update idea detail and homepage to reflect design proposal
m3brown
committed
e7e700d
Merge pull request #18 from dlapiduz/notifications
m3brown
committed
4b4441c
IN-462 - Add challenge text
m3brown
committed
7f00b52
Merge pull request #21 from m3brown/challenge-text
dlapiduz
committed
a23e546
Merge branch 'custom_comments' of github.com:m3brown/idea-box into m3brown-custom_comments
dlapiduz
committed
a51ea66
Merge branch 'style' of github.com:m3brown/idea-box into m3brown-style
dlapiduz
committed
e1cc8e6
Add mptt to buildout
dlapiduz
committed
0347654

Commits on Apr 16, 2014

Merge pull request #22 from dlapiduz/master
cmc333333
committed
4f89fa2
Fix some issues from merging cfpb/idea-box#19 and cfpb/idea-box#20
m3brown
committed
77b2363
IN-314 - Fix indented child comments in IE
m3brown
committed
7b99b17
Merge pull request #23 from m3brown/style
dlapiduz
committed
2bba510
Fix fontawesome icon for Read More link in IE
m3brown
committed
4e43c51
Merge pull request #24 from m3brown/style
dlapiduz
committed
1aa8d73
IN-449 - Add help text for idea create page
m3brown
committed
1a89cfe
pep8 cleanup
m3brown
committed
5b4e455
Merge pull request #25 from m3brown/style
dlapiduz
committed
f9c9292

Commits on Apr 17, 2014

Peg django version, thereby reduce the number of tests we need to skip
cmc333333
committed
affdd53
Merge pull request #26 from cmc333333/match-version
dlapiduz
committed
ff2f387
IN-481 - Add autocomplete for existing idea tags
m3brown
committed
f6ae060

Commits on Apr 18, 2014

IN-482 - The user can now remove tags he or she added
m3brown
committed
93185c1
IN-470 - Use common formatting to top left title
m3brown
committed
71ee25d
IN-472 - Update summary/detail formatting in detail page
m3brown
committed
2d2767b
IN-482 - tags_by_creator should only be used with collab.core.taggit, not regular taggit
m3brown
committed
b893627
IN-476 - Update sidebar location, challenge page to reflect design sample
m3brown
committed
79b3ff9
IN-469 - Adjust style for 'Read More' in challenge page
m3brown
committed
3f7bedc
IN-469 - Adjust border between ideas
m3brown
committed
9df80d8

Commits on Apr 21, 2014

Merge pull request #27 from m3brown/autocomplete
dlapiduz
committed
9e6b556
Merge pull request #28 from m3brown/tag_remove
dlapiduz
committed
7cd234d
Merge pull request #29 from m3brown/style
dlapiduz
committed
8bb6823
Remove overflow auto to remove scroll bars
dlapiduz
committed
cb0d490
Add selectize
dlapiduz
committed
660a992
Use selectize for autocomplete tags in add page
dlapiduz
committed
37517be
Update README.md
Stephanie V
committed
2ec35b7
Update models.py
Stephanie V
committed
a918667
Merge pull request #30 from dlapiduz/overflow-fix
m3brown
committed
688b01a
Lock taggit to older version since newer builds break when Django <= 6
m3brown
committed
35163c5
Merge pull request #32 from Vineyards/master
m3brown
committed
afe3b67
Merge pull request #31 from m3brown/taggit-version
dlapiduz
committed
dc3b6cb

Commits on Apr 22, 2014

Add es5 shim for IE
dlapiduz
committed
ee506d6
Merge pull request #33 from dlapiduz/selectize
m3brown
committed
d059910
IN-478 - Improve style consistency for selectize tool
m3brown
committed
150b426
Update informative text as requested
m3brown
committed
5686025
IN-482 - Fix remove_tag regex to support multi-word tags
m3brown
committed
0780851
Merge pull request #36 from m3brown/tag_remove
dlapiduz
committed
aae7d36
Merge pull request #35 from m3brown/selectize
dlapiduz
committed
5ebc988
Improve style for pagination of idea lists
m3brown
committed
de7052d
Merge pull request #34 from m3brown/pagination
dlapiduz
committed
be5baa3
IN-469 - Submit for current challenge link auto-selects challenge in dropdown
m3brown
committed
50c4ae1
IN-469 - Update font style for challenge idea list titles
m3brown
committed
521200a

Commits on Apr 23, 2014

Merge pull request #37 from m3brown/style
dlapiduz
committed
03e3970
Add tests to ensure ideabox properly handles tagged items
m3brown
committed
6b67af5
Tags for new ideas are associated with the creating user
m3brown
committed
fc6989e
Fix issue where remove tag option was available if you created the tag for a different idea
m3brown
committed
0393104
Fix bug where selectize doesnt show label
dlapiduz
committed
383d1a4
Merge pull request #40 from dlapiduz/selectize
m3brown
committed
6cb406b
IN-478 - Adjustments to 150b4263f9 to improve rendering in IE
m3brown
committed
d27d4d9
Show top 25 tags on right sidebar, previously top 10
m3brown
committed
f1ee8d2
Remove underlined space after tags on right sidebar
m3brown
committed
aa2a19f
Remove extra carrot character in comments
m3brown
committed
73d2cee
Make 'Liked' and 'Like' buttons have identical widths
m3brown
committed
ab4a15d
Challenge page sorts idea by creation time, doesn't display archived
m3brown
committed
284ea18
Fix broken tests caused by d27d4d9
m3brown
committed
c6fa886
Merge pull request #39 from m3brown/style
dlapiduz
committed
8e42bbe

Commits on Apr 25, 2014

Adjust fc6989e, provide alternate way of saving creator to tagged items
m3brown
committed
c2fd539

Commits on Apr 28, 2014

Merge pull request #38 from m3brown/tag_tests
dlapiduz
committed
fb04730
Fix sidebar tag filtering
m3brown
committed
a64df05
Fix test failures from d79e574, add tests for banner page
m3brown
committed
eafbb08
Ensure gui doesn't allow adding ideas to inactive challenges
m3brown
committed
dff1fb7
Merge pull request #41 from m3brown/style
dlapiduz
committed
39ba3be
'Read More >' should all be on the same line
m3brown
committed
2eb6a15
Tweak padding for challenge banners
m3brown
committed
3e94b12
Merge pull request #42 from m3brown/style
dlapiduz
committed
091b161
Remove padding spaces before 'Read More' links
m3brown
committed
be31efe

Commits on Apr 29, 2014

IN-502 - Add CSV export for idea, banner, and votes
m3brown
committed
501d1fa
Merge pull request #43 from m3brown/style
dlapiduz
committed
e1c2cf2
Merge pull request #44 from m3brown/csv_export
dlapiduz
committed
bf27507

Commits on Apr 30, 2014

Commits on May 6, 2014

IN-509 - Update color of tag button in add idea page
m3brown
committed
43e6f95

Commits on May 8, 2014

Update right sidebar headers from h4 to h3
m3brown
committed
0ed5c42

Commits on May 12, 2014

Merge pull request #45 from m3brown/about_text
dlapiduz
committed
34e1d69
Merge pull request #46 from m3brown/style
dlapiduz
committed
e8631f0

Commits on May 13, 2014

Commits on May 14, 2014

IN-540 - Compact header includes '< Back To'
m3brown
committed
c5e3833
Merge pull request #49 from m3brown/style
dlapiduz
committed
48653d5

Commits on May 21, 2014

Commits on May 27, 2014

Hotfix duplicate of 7980c71
m3brown
committed
1f783a8
HTML text can be used in the admin 'config' fields
m3brown
committed
ac0ac41
Merge pull request #52 from m3brown/hotfix
cmc333333
committed
b0a0ff7
IN-555 Add add idea success page
m3brown
committed
43a8d52
Add id_idea to context
m3brown
committed
6412104
Update top left header style to 16px non-uppercase
m3brown
committed
30dad92
Search and replace 'Idea Box' with 'IdeaBox'
m3brown
committed
e5fd0df
IN-555 Update tests to reflect c311775
m3brown
committed
3655ecb
IN-561 challenge box no longer reappears with incomplete submission
m3brown
committed
3a8febf

Commits on May 28, 2014

Merge pull request #51 from m3brown/style
dlapiduz
committed
bf4924f

Commits on Jun 4, 2014

Commits on Jun 6, 2014

Challenge dropdown default is 'Select'
m3brown
committed
737bb34
Correct some pep8 ugliness
m3brown
committed
cd05bba
Merge pull request #53 from m3brown/style
m3brown
committed
15e714b

Commits on Jun 9, 2014

Summary field should be be a multi-line text box
m3brown
committed
3986635
Merge pull request #54 from m3brown/style
m3brown
committed
a97496a
Fix some typos
m3brown
committed
da3dca9

Commits on Jun 10, 2014

IN-554 - Add ability to edit an existing idea
m3brown
committed
ede600b
Use better formatting for multi-line strings
m3brown
committed
88b7cf2
IN-546 - Fix spacing for help text below summary box
m3brown
committed
5422e02
Merge pull request #55 from m3brown/typo
m3brown
committed
b6cc902
IN-546 - Remove unused variable
m3brown
committed
c5f674b
IN-546 - Improve error catching for cleaned_data[tags]
m3brown
committed
be6ac46
IN-545 - Blue back button for IdeaBox
m3brown
committed
41e3ddb
Merge pull request #57 from m3brown/style
m3brown
committed
41a2e1d
Merge pull request #56 from m3brown/edit_idea
m3brown
committed
33e58c6

Commits on Jun 12, 2014

IN-546 - Add character counter to textarea fields in form
m3brown
committed
b6cf6e1
Merge pull request #58 from m3brown/add_idea_counter
m3brown
committed
7c2fc79

Commits on Jun 18, 2014

added tags to allow urls and linebreaks
Dev Mehta
committed
ec8a105
added urlize to about_text field
Dev Mehta
committed
75e9d6a
Merge pull request #59 from mehtadev17/master
m3brown
committed
e14badf

Commits on Jun 19, 2014

Adjust counter position so it doesn't overlap scrollbar in IE
m3brown
committed
2f8f8df
Merge pull request #60 from m3brown/counter-tweak
m3brown
committed
4e91fbe
added challenge on idea detail page
Dev Mehta
committed
e1ea816

Commits on Jun 20, 2014

fixed formatting
Dev Mehta
committed
4d4951e
modified logic
Dev Mehta
committed
e3251a3
formatting
Dev Mehta
committed
af3d8b8
Merge pull request #62 from mehtadev17/master
m3brown
committed
47ead83
backend working
Dev Mehta
committed
0505939
frontend done
Dev Mehta
committed
9af7eae

Commits on Jun 23, 2014

Commits on Jun 24, 2014

Merge pull request #65 from m3brown/banner_list
m3brown
committed
e89e159
Merge pull request #66 from m3brown/links
m3brown
committed
f7bed94
Update capitalization of titles and proper nouns
m3brown
committed
137ad41
Fix test broken by a modified string
m3brown
committed
b92906f
Merge pull request #67 from m3brown/titles
m3brown
committed
4d62fd3
Button font should be Avenir Medium
m3brown
committed
0f4e089
Merge pull request #68 from m3brown/titles
m3brown
committed
536b5e9

Commits on Jun 26, 2014

Added Unlike Capability
Seph Coster
committed
34c2df0
Merge branch 'master' of https://github.com/cfpb/idea-box
Seph Coster
committed
b13b553
Updated Button Styles to CF Stds
Seph Coster
committed
c6f80c1
Updated Tests / Details Like Btn
Seph Coster
committed
dfc0953

Commits on Jun 27, 2014

Fixed CSS error, removed debug, cleaned if statement
Seph Coster
committed
ceae8e5
CSS Cleanup
Seph Coster
committed
e5eee48

Commits on Jun 30, 2014

Updated chevron styles
Seph Coster
committed
0b26ed4
CSS Cleanup
Seph Coster
committed
960ac3a

Commits on Jul 1, 2014

Merge pull request #69 from sephcoster/master
m3brown
committed
0fa58aa

Commits on Jul 2, 2014

IN-619: Added hyperlinks and line breaks to commenting
Dev Mehta
committed
55530ff
Merge pull request #70 from mehtadev17/master
m3brown
committed
3a011f3
Added like limit, detail page
Seph Coster
committed
b5a6863
Debug cleanup
Seph Coster
committed
b5fa49a
Conditional likes detail btn
Seph Coster
committed
dcfbb1d
Updated chevron styles, fonts
Seph Coster
committed
eb3f5b2
Updated idea styles
Seph Coster
committed
ea2c974
Updated Chevron right after
Seph Coster
committed
82ddcce
updated banner detail more icon
Seph Coster
committed
fc443bd
Merge pull request #71 from sephcoster/likeLimit
m3brown
committed
878c9bf
IN-612 - Decouple auth.User to enable custom user models
m3brown
committed
fad37d2
IN-612 - Update tests to reflect decoupled user model
m3brown
committed
969512e
IN-612 - Migrate user model to core.CollabUser
m3brown
committed
28caa3b
IN-612 - Use generic django.conf instead of collab.settings to import settings
m3brown
committed
9d31419
IN-612 - Include collab in buildout so CollabUser can be utilized in solo mode
m3brown
committed
efceeed
Add pillow to buildout
m3brown
committed
ddd3473
IN-525 - Fix the duplicate chevron right for 'Read More' in the challenge detail page
m3brown
committed
30f1317

Commits on Jul 7, 2014

Merge pull request #73 from m3brown/idea-more
m3brown
committed
185b638
Update buildout's collab to point to cfpb repo
m3brown
committed
b84ed87
Merge pull request #72 from m3brown/usermodel
m3brown
committed
617d86e

Commits on Jul 8, 2014

Removed back to top, changed like text

Seph Coster
authored and
m3brown
committed
ae441f6
Merge pull request #74 from m3brown/likeLimit
m3brown
committed
37fc860

Commits on Sep 9, 2014

Allow urls and newlines in banner description
m3brown
committed
3ee9005
Use multi-line text-field for challenge description
m3brown
committed
a91aecc

Commits on Sep 10, 2014

Merge pull request #75 from m3brown/challenge_urlize
m3brown
committed
d3f9f18

Commits on Oct 3, 2014

Fix add_idea when multiple States have no previous
m3brown
committed
6d848c4
Merge pull request #76 from m3brown/state_helper
m3brown
committed
2e1cb65

Commits on Oct 6, 2014

Remove unused 'similar' from add_idea view
m3brown
committed
f6b86c6

Commits on Oct 16, 2014

Add sample CSS style document to improve the look of ideabox when running without collab
m3brown
committed
27e60d2
Update the screenshot
m3brown
committed
e720740
Remove mention of team name in idea created page
m3brown
committed
13bcaeb
Merge pull request #79 from m3brown/project_name
Scotchester
committed
667231b
Add comments for why similar is being disabled
m3brown
committed
3f6fbf5
Merge pull request #77 from m3brown/similar
Scotchester
committed
772280e
Update README with info on the sample style
m3brown
committed
819ef85
Merge pull request #78 from m3brown/style
Scotchester
committed
2a8468b
Remove dependencies on Collab's core.collabuser and core.taggit
m3brown
committed
6427dc5

Commits on Oct 17, 2014

Remove haystack/search functionality as it is not being used
m3brown
committed
8626873

Commits on Oct 20, 2014

Re-add search_indexes.py, which is used by collab
m3brown
committed
0488315

Commits on Oct 22, 2014

readme updates
dpford
committed
910cffb
Merge pull request #1 from dpford/readme_update
m3brown
committed
baa7420
Merge pull request #80 from m3brown/standalone
dpford
committed
3a0300b

Commits on Dec 8, 2014

Commits on Dec 9, 2014

Remote ugly '(ends None)' from dropdown selector if no end_date is defined
m3brown
committed
8da46a4
Edit Idea form now works with private rooms
m3brown
committed
129daf1
Update templates to use appropriate challenge and room detail urls
m3brown
committed
49ea43d
Ensure private ideas don't appear in search results
m3brown
committed
7f427e8
Tests now run when bundled with collab
m3brown
committed
6a451f2
Merge branch 'tests' of github.com:m3brown/idea-box into private
m3brown
committed
2a318cf
Merge pull request #83 from m3brown/tests
m3brown
committed
0f61d5d
Add tests for private room functionality
m3brown
committed
941abff

Commits on Dec 10, 2014

Use correct URL formatting in banner_detail template
m3brown
committed
5505cd8
Update return link on add_success page for private ideas
m3brown
committed
c6ee78e

Commits on Dec 11, 2014

Commits on Dec 12, 2014

Notifications for anonymous comments should also be anonymous
m3brown
committed
2c6d6f8
Improve wording of anonymous checkboxes, since they aren't truly anonymous
m3brown
committed
6f2d25a
Forgot to add new anonymous templates in the previous commit
m3brown
committed
af8848e
Fix incorrect tag for room link in banner admin
m3brown
committed
9f51d1e
Change name of anonymous commenter
m3brown
committed
0e397df
Merge pull request #84 from m3brown/private
m3brown
committed
471e74f

Commits on Feb 11, 2015

IdeaBox is not hypenated. Django is capitalized
Shashank Khandelwal
committed
ea942ad
Grammar
Shashank Khandelwal
committed
d284189
Merge pull request #85 from khandelwal/master
Scotchester
committed
63ad3f1

Commits on Mar 20, 2015

Update taggit info in README
m3brown
committed
ce4aae2

Commits on Mar 25, 2015

Merge pull request #86 from m3brown/readme
Scotchester
committed
248fc8a

Commits on Aug 25, 2015

Remove buildout
CM Lubinski
committed
026aad4
Remove 'src' directory
CM Lubinski
committed
d37809f
Remove buildout folder
CM Lubinski
committed
f252bdf

Commits on Aug 26, 2015

Don't require nose in the base settings
CM Lubinski
committed
117ec69
Fix type inconsistency in sql
CM Lubinski
committed
1be6da6
Merge branch 'remove-buildout' into postgres-type-error
CM Lubinski
committed
acf5807