Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Fix #4671] Creating new contact item in mssql #4686

Closed
wants to merge 169 commits into from
Closed

[Fix #4671] Creating new contact item in mssql #4686

wants to merge 169 commits into from

Conversation

adrianfso
Copy link

This proposed fix makes it possible to create a new contact item with an MS-SQL database.

ALTER TABLE dbo.#_contact_details ADD CONSTRAINT DF#__contact_details_checked_out DEFAULT 0 FOR checked_out

Michael Babker and others added 30 commits April 30, 2014 08:36
Branch for 3.4 development
f4ecbad
Merge branch 'staging' into 3.4-dev
3f06120
@Kubik-Rubik
[imp] [33617]] New option for redirect plugin: Collect URLs
581a03e 
Close #3450
Merge remote-tracking branch 'joomla/staging' into 3.4-dev
b3ea2e3
Merge remote-tracking branch 'joomla/staging' into 3.4-dev
dbe7689
Merge remote-tracking branch 'joomla/staging' into 3.4-dev
ba4d1bf
Merge remote-tracking branch 'joomla/staging' into 3.4-dev
4941c46
@hans2103
[#33753] Implementation of Redis caching (Fix #3615)
5a845d2
Merge remote-tracking branch 'joomla/staging' into 3.4-dev
ecd2bb2
[imp] [33569] Update Message for extenions
6df2d15 
Closes #3411
Merge remote-tracking branch 'joomla/staging' into 3.4-dev
58b05ad
Merge remote-tracking branch 'joomla/3.4-dev' into 3.4-dev
6e0b213
[imp] [33607] Replace FOFLess use with JLess wrapping lessc library;
e83342a 
Closes #3436
Merge remote-tracking branch 'joomla/staging' into 3.4-dev
e60db60
@phproberto
[imp][33902] JArrayHelper::toObject allow non-recursive conversion
142e932 
Close #3836
[regression] Fixed Redis cache options.
a2033d6
Merge branch 'staging' into 3.4-dev
4091bea
Merge branch 'staging' into 3.4-dev
e506a01
@sanderpotjer
[imp][33272] Add date filter to Most Read Content module (mod_article…
923a661 
…s_popular).

Closes #3100
[imp][33862] Improving the Joomla! extensions update for end-users.
22f7bdd 
Closes #3775
Merge branch 'staging' into 3.4-dev
344ced5
@phproberto
[imp] Add advanced parameters to module chromes. Fixes #3760
f72f6fb
@infograf768
Sync lib_joomla.ini
fd5e9e9
@infograf768
Updating lang xml version
2615fa9
Merge branch 'staging' into 3.4-dev
d4c6bd2
@roland-d
[imp][32063] Added support to change link color in isis template (bac…
3a36250 
…kend);

Closes #3733
@asika32764
[imp][33321] Add labels in language & installer manager.
2cf6629 
Closes #3154
@Kubik-Rubik
[imp][33877] Batch process to add URLs in Redirect component;
33f0793 
Closes #3798
Merge branch 'staging' into 3.4-dev
87f06c2
Merge branch 'staging' into 3.4-dev
a343831
zero-24 and others added 9 commits October 8, 2014 09:42
@zero-24 @phproberto
[imp] Improve ignore files. Fixes #1472. Fixes #4477
80174f5 
New PR for #1472 that improve the `.gitignore` file but is out of sync and against master

And tested by @Hackwar see #1472 (comment)
@bembelimen @phproberto
[imp] Added flexible ordering to the similar tags module. Fixes #4288
08f2cbe 
Added new language strings

Updated language constants

Updated ordering

Removed tab and added spaces

Update en-GB.mod_tags_similar.ini

Removed empty line
@phproberto
Merge branch 'staging' into 3.4-dev
f49253a 
Conflicts:
	libraries/cms/router/site.php
@zero-24 @phproberto
[imp] New Joomla update server naming. Fixes #3681
6dd33ee 
According to our new Development strategy:
http://developer.joomla.org/news/586-joomla-development-strategy.html#version_numbering

restore old values and mark it deprecated for 4.0

Update inline comments

Update config.xml

Next --> New thanks @brianteeman

Fix typos thanks @nicksavov

Fix typos thanks @nicksavov

@deprecated tag

New --> Latest @nicksavov

New --> Latest @nicksavov

Update default.php

Update en-GB.com_joomlaupdate.ini
@zero-24
Fix the new Updatesites enable and disable messages (Fix #4365)
032b87f
@zero-24
Codestyle for the new updatesites feature (Fix #4366)
2911e71
@zero-24
Codestyle for the new option for redirect plugin: Collect URLs (Fix #…
c96176a 
…4368)
Merge pull request #4248 from okonomiyaki3000/CodeMirrorUpdate
e9370ba 
CodeMirror 4.6
Address test failures
f1077bb
@adrianfso adrianfso mentioned this pull request Oct 15, 2014
Closed
Merge branch 'staging' into 3.4-dev
ae1e5cc 
Conflicts:
	administrator/components/com_categories/models/fields/categoryedit.php
	administrator/components/com_installer/controllers/update.php
	administrator/components/com_installer/models/database.php
	administrator/components/com_installer/models/update.php
	administrator/components/com_joomlaupdate/models/default.php
	administrator/components/com_languages/models/override.php
	administrator/components/com_languages/models/overrides.php
	administrator/components/com_modules/controller.php
	administrator/components/com_plugins/models/plugin.php
	administrator/components/com_postinstall/models/messages.php
	administrator/components/com_redirect/helpers/redirect.php
	administrator/components/com_redirect/views/links/view.html.php
	administrator/components/com_weblinks/controller.php
	administrator/components/com_weblinks/controllers/weblink.php
	administrator/components/com_weblinks/controllers/weblinks.php
	administrator/components/com_weblinks/helpers/weblinks.php
	administrator/components/com_weblinks/models/weblink.php
	administrator/components/com_weblinks/models/weblinks.php
	administrator/components/com_weblinks/tables/weblink.php
	administrator/components/com_weblinks/views/weblink/view.html.php
	administrator/components/com_weblinks/views/weblinks/view.html.php
	components/com_contact/models/categories.php
	components/com_contact/models/category.php
	components/com_contact/views/category/view.html.php
	components/com_newsfeeds/models/categories.php
	components/com_newsfeeds/views/category/view.html.php
	components/com_weblinks/controller.php
	components/com_weblinks/controllers/weblink.php
	components/com_weblinks/helpers/association.php
	components/com_weblinks/helpers/category.php
	components/com_weblinks/helpers/icon.php
	components/com_weblinks/helpers/route.php
	components/com_weblinks/models/categories.php
	components/com_weblinks/models/category.php
	components/com_weblinks/models/form.php
	components/com_weblinks/models/weblink.php
	components/com_weblinks/router.php
	components/com_weblinks/views/categories/view.html.php
	components/com_weblinks/views/category/view.feed.php
	components/com_weblinks/views/category/view.html.php
	components/com_weblinks/views/form/view.html.php
	components/com_weblinks/views/weblink/view.html.php
	installation/application/web.php
	installation/model/database.php
	libraries/joomla/form/fields/repeatable.php
	libraries/joomla/form/rule/url.php
	libraries/joomla/linkedin/oauth.php
	libraries/joomla/mediawiki/http.php
	libraries/joomla/mediawiki/mediawiki.php
	libraries/joomla/mediawiki/object.php
	libraries/joomla/twitter/oauth.php
	plugins/finder/weblinks/weblinks.php
	plugins/search/weblinks/weblinks.php
@nicksavov
Copy link
Contributor

Hi Adrian,

Thanks for submitting!

Unfortunately, looks like you're submitting from the 3.4-dev branch. Try switching to the staging branch, then create a new branch from it.

Here's a really easy way how:
http://docs.joomla.org/Using_the_Github_UI_to_Make_Pull_Requests

Michael Babker and others added 13 commits October 16, 2014 08:41
Merge remote-tracking branch 'joomla/staging' into 3.4-dev
4d9d93c
Remove unimplemented stubs in test
7771a95
@wilsonge
Pagination Unit Tests (Fix #3768)
a1f1c27
Updating a couple of JRegistry references
63844c5
Add note about changing static method
7b1cbd5
@infograf768
Merge pull request #4701 from mbabker/nonStaticGetTable
1782d26 
Add note about changing static method
Merge branch 'staging' into 3.4-dev
bd9edc2 
Conflicts:
	administrator/components/com_weblinks/views/weblink/tmpl/edit.php
	tests/unit/suites/finderIndexer/FinderIndexerTest.php
	tests/unit/suites/libraries/cms/application/JApplicationAdministratorTest.php
	tests/unit/suites/libraries/cms/application/JApplicationCmsTest.php
	tests/unit/suites/libraries/joomla/cache/storage/JCacheStorageMainTest.php
Merge remote-tracking branch 'joomla/staging' into 3.4-dev
a07cd11
@Kubik-Rubik
Wrapper class to remove static methods (Fix #4717)
d6fdd30
@brianteeman
Change History to Versions. Fixes #4666
b09539c
Merge branch 'staging' of github.com:joomla/joomla-cms into 3.4-dev
fb2377b
Merge branch '3.4-dev' of github.com:joomla/joomla-cms into 3.4-dev
eb45d4a
[imp] Disallow directory listings in default config. Closes #4171
162f70e
@mbabker
Copy link
Contributor

mbabker commented Oct 17, 2014

Closing as the PR is not valid due to the branch merges.

@mbabker mbabker closed this Oct 17, 2014
@adrianfso
Copy link
Author

Thank you for the help -- however, I'm not sure which file this proposed update should go into! I assume it would be an "sql" file within "administrator/com_admin/sql/updates/sqlazure/" but I do not see a "3.3.7" file, and it seems incorrect to edit the file "3.3.6-2014-09-30.sql". Any help with this would be greatly appreciated! Thank you.

@Bakual
Copy link
Contributor

Bakual commented Oct 20, 2014

You just add a new one 3.3.7-2014-10-20.sql. Each PR has its own SQL file then.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet