summaryrefslogtreecommitdiffstats
path: root/wp-admin/import
Commit message (Collapse)AuthorAgeFilesLines
* Merge with WP 2.6.2donncha2008-09-151-1/+1
| | | | git-svn-id: http://svn.automattic.com/wordpress-mu/branches/2.6@1471 7be80a69-a1ef-0310-a953-fb0f7c49ff36
* WP merge to revision 8283donncha2008-07-081-2/+2
| | | | git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1356 7be80a69-a1ef-0310-a953-fb0f7c49ff36
* WP Merge with revision 8255donncha2008-07-041-1/+1
| | | | git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1350 7be80a69-a1ef-0310-a953-fb0f7c49ff36
* WP Merge to revision 8180donncha2008-06-241-145/+177
| | | | git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1336 7be80a69-a1ef-0310-a953-fb0f7c49ff36
* WP Merge with revision 8075donncha2008-06-137-72/+266
| | | | git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1328 7be80a69-a1ef-0310-a953-fb0f7c49ff36
* Merged with WP 2.5, revision 7806donncha2008-04-242-2/+2
| | | | git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1260 7be80a69-a1ef-0310-a953-fb0f7c49ff36
* Merged with WordPress 2.5, unstable, only for testingdonncha2008-04-0414-247/+569
| | | | git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1218 7be80a69-a1ef-0310-a953-fb0f7c49ff36
* Cast term id to int. fixes #562ryan2008-02-201-2/+2
| | | | git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1200 7be80a69-a1ef-0310-a953-fb0f7c49ff36
* Backporting http://trac.wordpress.org/changeset/6332 from WP trunk to fix #562donncha2008-02-191-1/+1
| | | | git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1199 7be80a69-a1ef-0310-a953-fb0f7c49ff36
* Merge with WordPress 2.3.1donncha2007-10-301-1/+1
| | | | git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1139 7be80a69-a1ef-0310-a953-fb0f7c49ff36
* Merge with WordPress, rev 6285 and untesteddonncha2007-10-232-44/+16
| | | | git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1125 7be80a69-a1ef-0310-a953-fb0f7c49ff36
* Assign authors correctly, props washort, fixes #435donncha2007-10-181-1/+1
| | | | git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1103 7be80a69-a1ef-0310-a953-fb0f7c49ff36
* Cast as array to stop warning, fixes #405donncha2007-10-181-1/+1
| | | | git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1102 7be80a69-a1ef-0310-a953-fb0f7c49ff36
* Merge with WP 2.3 - testing use only!donncha2007-10-1214-337/+1431
| | | | | | | Move pluggable functions out of wpmu-functions and into pluggable.php, fixes #439 git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1069 7be80a69-a1ef-0310-a953-fb0f7c49ff36
* Removing code that isn't needed, prompted by #358donncha2007-06-251-35/+8
| | | | git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1007 7be80a69-a1ef-0310-a953-fb0f7c49ff36
* WP Merge to WP 2.2.1donncha2007-06-213-395/+395
| | | | git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1005 7be80a69-a1ef-0310-a953-fb0f7c49ff36
* Too soon for thesedonncha2007-05-212-496/+0
| | | | git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@974 7be80a69-a1ef-0310-a953-fb0f7c49ff36
* WP Merge to rev 5499, this is a big one! Test it before you put it live!donncha2007-05-2110-120/+705
| | | | | | | Test only, not for production use yet git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@972 7be80a69-a1ef-0310-a953-fb0f7c49ff36
* Ryan casts an int and catches a fish, someone buy him a pint! merge to 5092donncha2007-03-236-9/+9
| | | | git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@933 7be80a69-a1ef-0310-a953-fb0f7c49ff36
* WP Merge to rev 5061donncha2007-03-192-4/+6
| | | | git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@920 7be80a69-a1ef-0310-a953-fb0f7c49ff36
* WP Merge to rev 5007donncha2007-03-091-2/+2
| | | | git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@909 7be80a69-a1ef-0310-a953-fb0f7c49ff36
* WP Merge to rev 4956donncha2007-02-282-15/+15
| | | | git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@904 7be80a69-a1ef-0310-a953-fb0f7c49ff36
* wp merge to rev 4896donncha2007-02-201-579/+912
| | | | | | | | Ryan's nooption fixes jquery filename is different git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@890 7be80a69-a1ef-0310-a953-fb0f7c49ff36
* Removed iframe from kses whitelistdonncha2007-02-051-1/+1
| | | | | | | Minor translation change in wordpress importer git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@881 7be80a69-a1ef-0310-a953-fb0f7c49ff36
* WP merge to 4681donncha2007-01-051-3/+4
| | | | git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@831 7be80a69-a1ef-0310-a953-fb0f7c49ff36
* WP Mergedonncha2006-12-078-20/+30
| | | | git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@819 7be80a69-a1ef-0310-a953-fb0f7c49ff36
* WP Merge to 4559donncha2006-11-302-5/+37
| | | | git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@816 7be80a69-a1ef-0310-a953-fb0f7c49ff36
* WP Merge to 4524donncha2006-11-247-182/+183
| | | | git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@810 7be80a69-a1ef-0310-a953-fb0f7c49ff36
* WP Mergedonncha2006-11-071-22/+5
| | | | git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@804 7be80a69-a1ef-0310-a953-fb0f7c49ff36
* WP Merge to rev 4370donncha2006-10-102-16/+19
| | | | git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@798 7be80a69-a1ef-0310-a953-fb0f7c49ff36
* WP Merge - needs testing.donncha2006-10-092-39/+12
| | | | git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@797 7be80a69-a1ef-0310-a953-fb0f7c49ff36
* WP Merge to rev 4349donncha2006-10-067-21/+32
| | | | git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@793 7be80a69-a1ef-0310-a953-fb0f7c49ff36
* WP Merge to rev 4273donncha2006-10-032-2/+2
| | | | git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@788 7be80a69-a1ef-0310-a953-fb0f7c49ff36
* WP Merge to #4124donncha2006-09-089-74/+126
| | | | git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@734 7be80a69-a1ef-0310-a953-fb0f7c49ff36
* WP Merge to rev #4147donncha2006-08-311-2/+2
| | | | git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@729 7be80a69-a1ef-0310-a953-fb0f7c49ff36
* WP Mergedonncha2006-07-064-19/+19
| | | | git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@638 7be80a69-a1ef-0310-a953-fb0f7c49ff36
* WP Mergedonncha2006-06-271-3/+3
| | | | git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@599 7be80a69-a1ef-0310-a953-fb0f7c49ff36
* Moved everything in wp-inst down a directory.donncha2006-06-2210-0/+3623
Uses's Ryan Boren's htaccess rules and mods If you're upgrading, try this on a test server first! git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@591 7be80a69-a1ef-0310-a953-fb0f7c49ff36