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

Joomla! Update: reinstall Joomla! and Update & Install features | seccond try #9612

Merged
merged 89 commits into from
Apr 13, 2016
Merged

Joomla! Update: reinstall Joomla! and Update & Install features | seccond try #9612

Changes from 1 commit
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
13416a8
Joomla! Update: Reinstall current version
Mar 11, 2016
8880ed9
Joomla! Update: Reinstall current version
Mar 11, 2016
a8d1488
Joomla! Update: Reinstall current version
Mar 11, 2016
6701709
Merge remote-tracking branch 'nikosdion/staging' into feature/joomlau…
Mar 16, 2016
8278b6e
Merge remote-tracking branch 'joomla/staging' into feature/joomlaupda…
Mar 16, 2016
128eeb9
Oops, typo
Mar 16, 2016
e4e6e62
Bump Joomla! Update version
Mar 16, 2016
133d315
Move alternative panels into separate view template layouts
Mar 16, 2016
13fb84d
Reinstall is only supported in newer versions of Joomla!
Mar 16, 2016
a6dd02c
Upload form in a tab
Mar 16, 2016
91bee90
Typo
Mar 16, 2016
0e3e7fa
Upload to temporary file
Mar 16, 2016
c9f459c
Captive login validation
Mar 16, 2016
7cd1954
Final step to install from file
Mar 17, 2016
c714664
Fix FTP mode; add Hybrid mode
Mar 17, 2016
2137111
Bug fixes
Mar 18, 2016
9106bdf
Code style fixes
wilsonge Mar 18, 2016
27a8491
Add back weblinks file
wilsonge Mar 18, 2016
18e504f
Merge pull request #1 from wilsonge/joomlaupdate
Mar 19, 2016
e559c76
Removing the bang from "Joomla!" in the language files per @brianteem…
Mar 19, 2016
61bd494
Misplaced token check
Mar 19, 2016
387cec6
Not enough coffee
Mar 19, 2016
71c9469
Profoundly crap code to make our asinine PHP Code Sniffer rules happy
Mar 19, 2016
a798b11
bump version number and some CS
zero-24 Mar 21, 2016
e8ac62c
Update default.php
zero-24 Mar 21, 2016
a7209c5
version numbers
zero-24 Mar 21, 2016
6eb64bf
some CS
zero-24 Mar 21, 2016
4b0e62f
CS
zero-24 Mar 21, 2016
78b6110
CS
zero-24 Mar 21, 2016
fd8e576
set login center and some cs
zero-24 Mar 21, 2016
8b38707
Update view.html.php
zero-24 Mar 21, 2016
4db9636
Update updater.php
zero-24 Mar 21, 2016
f7540cc
Update default_upload.php
zero-24 Mar 21, 2016
616b476
Update en-GB.com_joomlaupdate.ini
zero-24 Mar 21, 2016
768f4ae
Update default_upload.php
zero-24 Mar 21, 2016
dc48847
fix postgresql and use "IS NULL" insted of "= ``"
zero-24 Mar 21, 2016
9ab6da6
Update update.php
zero-24 Mar 26, 2016
3ecfcb7
use the api
zero-24 Mar 26, 2016
afe480e
Current plan is to ship it with 3.5.2
zero-24 Mar 26, 2016
28970f3
Update update.php
zero-24 Mar 26, 2016
b6d9ba5
Update default.php
zero-24 Mar 26, 2016
a3bf970
Update view.html.php
zero-24 Mar 26, 2016
7b00e27
Update view.html.php
zero-24 Mar 26, 2016
c69de3f
Update updater.php
zero-24 Mar 26, 2016
314e151
Create default.min.js
zero-24 Mar 26, 2016
01f3703
Create encryption.min.js
zero-24 Mar 26, 2016
c0e849f
Create json2.min.js
zero-24 Mar 26, 2016
cd05a80
Create update.min.js
zero-24 Mar 26, 2016
ca716d5
use & insted of &
zero-24 Mar 26, 2016
7f1b7fa
super admins can't reset or remind the password
zero-24 Mar 26, 2016
6445b6c
Update captive.php
zero-24 Mar 26, 2016
cd128af
Update default_reinstall.php
zero-24 Mar 26, 2016
6f89796
Update default_update.php
zero-24 Mar 26, 2016
9baeb7c
Update default_reinstall.php
zero-24 Mar 26, 2016
eb6bf3f
Update default_update.php
zero-24 Mar 26, 2016
a36bbc4
Create default_noupdate.php
zero-24 Mar 26, 2016
17c3143
Update default.php
zero-24 Mar 26, 2016
927276e
Update en-GB.com_joomlaupdate.ini
zero-24 Mar 26, 2016
4c339e4
Update default_noupdate.php
zero-24 Mar 26, 2016
0a3339b
Update en-GB.com_joomlaupdate.ini
zero-24 Mar 26, 2016
971cad1
Update default.php
zero-24 Mar 26, 2016
fb67346
Update default_reinstall.php
zero-24 Mar 26, 2016
25ce358
Update default_update.php
zero-24 Mar 26, 2016
0666516
Update en-GB.com_joomlaupdate.ini
zero-24 Mar 26, 2016
37b4cfb
Update en-GB.com_joomlaupdate.ini
zero-24 Mar 26, 2016
636d1d6
Update default_noupdate.php
zero-24 Mar 26, 2016
f9d4bce
Rename default_noupdate.php to default_nodownload.php
zero-24 Mar 26, 2016
ea36fce
Update default.php
zero-24 Mar 26, 2016
2e14033
Update default_nodownload.php
zero-24 Mar 26, 2016
1083ba8
Update en-GB.com_joomlaupdate.ini
zero-24 Mar 26, 2016
76c45d4
Update default_nodownload.php
zero-24 Mar 26, 2016
de9a2f8
Update default_upload.php
zero-24 Mar 26, 2016
7641823
Update view.html.php
zero-24 Mar 26, 2016
985a310
Update joomlaupdate.xml
zero-24 Mar 26, 2016
fcd8d0a
Update joomlaupdate.xml
zero-24 Mar 26, 2016
2454ce4
Update joomlaupdate.xml
zero-24 Mar 26, 2016
3e8f66a
Update joomlaupdate.xml
zero-24 Mar 26, 2016
df19cc3
Add the media folder to the build.xml thanks @mbabker
zero-24 Mar 26, 2016
34581a8
Update default_nodownload.php
zero-24 Mar 26, 2016
89e1976
Update default_nodownload.php
zero-24 Mar 26, 2016
5cfd4a7
Update default_nodownload.php
zero-24 Mar 26, 2016
daeb9ab
Update default.php
zero-24 Mar 27, 2016
1039304
update quote
brianteeman Mar 27, 2016
197fa87
Merge pull request #1 from brianteeman/patch-1
zero-24 Mar 27, 2016
36b1849
Fixed count thanks @andrepereiradasilva
zero-24 Mar 27, 2016
ea5f249
add language file to the package in build.xml
zero-24 Mar 27, 2016
1718d29
fix merge conflicts
zero-24 Apr 12, 2016
6264d68
remove CCOM and replace with COM
brianteeman Apr 12, 2016
bdee865
Merge pull request #3 from brianteeman/patch-2
zero-24 Apr 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions administrator/language/en-GB/en-GB.com_joomlaupdate.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ COM_JOOMLAUPDATE_VIEW_COMPLETE_MESSAGE="Your site has been successfully updated.
COM_JOOMLAUPDATE_VIEW_DEFAULT_DOWNLOAD_IN_PROGRESS="Downloading update file. Please wait ..."
COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_DOWNLOAD_URL="We can't find a download URL"
COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_DOWNLOAD_URL_DESC="An update to Joomla %1$s was found, but it wasn't possible to fetch the download URL for that update. There are two possibilities why this happens:<br>- Your host doesn't support <a href="_QQ_"https://www.joomla.org/technical-requirements.html"_QQ_">the minimum requirements for Joomla %1$s</a> and there is no alternative download for your configuration available.<br>- There is a problem with Joomla Update Server.<br><br>Please try to download the update package from <a href="_QQ_"https://www.joomla.org/download.html"_QQ_">the official Joomla download page</a> and use the Upload and Install tab."
COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_DIRECTORY="FTP folder"
COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_HOSTNAME="FTP host"
COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_PASSWORD="FTP password"
COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_PORT="FTP port"
COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_USERNAME="FTP username"
CCOM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_DIRECTORY="FTP Root"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CCOM?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@zero-24 see zero-24#3

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CCOM?

COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_HOSTNAME="FTP Host"
COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_PASSWORD="FTP Password"
COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_PORT="FTP Port"
COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_USERNAME="FTP Username"
COM_JOOMLAUPDATE_VIEW_DEFAULT_INFOURL="Additional Information"
COM_JOOMLAUPDATE_VIEW_DEFAULT_INSTALLAGAIN="Reinstall Joomla core files"
COM_JOOMLAUPDATE_VIEW_DEFAULT_INSTALLED="Installed Joomla version"
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.