Commit Graph

145 Commits

Author SHA1 Message Date
Marc Delisle
f3c28953d1 Fix merge conflict 2013-10-01 06:02:16 -04:00
Mohamed Ashraf
d90126ebd7 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into error_reporting
Conflicts:
	ChangeLog
	scripts/create-release.sh
2013-09-21 00:49:01 +02:00
Mohamed Ashraf
b33f0419df Linecounts script now only run if exists 2013-09-19 13:18:58 +02:00
Michal Čihař
d5a3dfc512 Merge remote-tracking branch 'origin/QA_4_0' 2013-09-18 09:22:27 +02:00
Michal Čihař
eccdfceaa6 Update list of files to cleanup 2013-09-18 09:22:15 +02:00
Michal Čihař
e24833c056 Even 4.0 now ships not compressed javascript 2013-09-18 09:01:35 +02:00
Mohamed Ashraf
088166f0a3 Merge remote-tracking branch 'origin/master' into error_reporting
Conflicts:
	ChangeLog
2013-09-01 13:07:52 +02:00
Marc Delisle
db7deeb6e9 List is deprecated 2013-08-25 13:05:19 -04:00
Mohamed Ashraf
92fad83168 Added new script to generate line counts of scripts in the js folder 2013-07-27 13:10:03 +02:00
Mohamed Ashraf
b9bf9e0bcc Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into error_reporting 2013-06-25 07:19:30 +02:00
Michal Čihař
39a0b5c31b Mark JS compression for future removal 2013-06-24 15:12:04 +02:00
Mohamed Ashraf
3b9fad42e0 Stopped the release script from deleting the original unminified file 2013-06-20 21:06:32 +02:00
Isaac Bennetch
55f8d4f38b Remove .jshintrc from distribution 2013-04-20 16:37:27 -04:00
Isaac Bennetch
86c507edec Remove .travis.yml file from releases 2013-02-19 19:30:04 -05:00
Marc Delisle
34e8a230b0 New sf interface for milestones 2013-01-20 13:39:53 -05:00
Michal Čihař
ba5d1a782a Remove readme.rst when releasing 2012-11-13 14:27:32 +01:00
Michal Čihař
7872a28c4b Adjust creating release to new documentation 2012-11-12 10:15:25 +01:00
Michal Čihař
f56c0f85a3 Exclude coding standard data from tarball 2012-04-26 15:42:29 +02:00
Marc Delisle
b76ac64121 Avoid STABLE update for a non-stable release 2012-04-24 08:01:46 -04:00
Marc Delisle
9ad2e1079f 3.4.x is no longer the stable version 2012-04-11 12:54:07 -04:00
Marc Delisle
bfd24b8a24 Typo 2012-02-14 12:43:01 -05:00
Marc Delisle
440c4cc6d0 TESTING branch is gone 2012-02-14 12:39:06 -05:00
Michal Čihař
752e3623d5 Remove testsuite setup from distributed tarballs as well 2012-02-14 16:19:58 +01:00
Michal Čihař
c748c3bf5a Compatibility with 3.4 branch 2012-02-14 16:15:18 +01:00
Michal Čihař
2ec471c13e Simplify code 2012-02-14 16:12:52 +01:00
Michal Čihař
987158fe8a We want to delete whole directory... 2012-02-14 16:11:50 +01:00
Michal Čihař
1e8f066a09 Remove whole scripts directory from release
This is only useful for developers now (user content was moved to
examples) and thus is useless to ship.
2012-02-14 16:07:46 +01:00
Marc Delisle
b82662961f Freshmeat.net renamed to freecode.com 2011-11-24 17:34:41 -05:00
Michal Čihař
d55306252b Replace tabs with spaces, cleanup identation 2011-07-22 10:15:08 +02:00
Michal Čihař
8f49a1a642 Adjust STABLE/TESTING marking for new major release (in case there will ever be bugfix for 3.3). 2011-05-11 14:18:52 +02:00
Michal Čihař
297035b853 Do not include incomplete translations in release.
Currently the threshold is set to 50%, but the discussion is still open
on mailing list and it might change.
2011-04-05 12:05:15 +02:00
Dieter Adriaenssens
fecfe761f9 drop Devel: prefix in links to wiki 2011-03-29 10:02:02 +02:00
Michal Čihař
6bba56bc71 Exclude new scripts from release as well 2011-02-24 16:02:11 +01:00
Michal Čihař
715b0b86b5 Do not mark anything from 3.3 branch as testing 2011-02-08 16:25:40 +01:00
Michal Čihař
70bc1761c3 Drop translators.html and all references to it.
The list is absolutely not up to date and it makes no sense in
maintaining it in addition to history of po files in git.
2010-12-31 15:51:34 +01:00
Marc Delisle
af6ef14673 Improve message 2010-12-11 06:36:08 -05:00
Marc Delisle
4645bd5475 Remove reference to an older script 2010-12-11 06:28:16 -05:00
Michal Čihař
21469844a5 Avoid creating tarball multiple times. 2010-12-07 14:44:42 +01:00
Michal Čihař
f4bedb04a9 Remove some unneded scripts when creating a release. 2010-12-07 14:38:45 +01:00
Michal Čihař
ffebaad757 Do not include javascript sources from release. 2010-12-07 14:30:14 +01:00
Michal Čihař
fd9187e8cc Enable generating of tar.xz 2010-12-02 16:52:45 +01:00
Michal Čihař
267c8fe735 Preprare for xz support. 2010-12-02 16:40:51 +01:00
Marc Delisle
7342b35e9f no need to include .po files in the releases 2010-11-24 12:57:47 -05:00
Michal Čihař
0431042bd0 Drop $Id$ expansion, nobody complained so far it not working. 2010-09-07 15:00:44 +02:00
Michal Čihař
2e8e9642a7 Remove .gitignore files on release. 2010-08-29 11:17:52 +02:00
Michal Čihař
272c57cdba Change back to master after merging to STABLE/TESTING. 2010-08-20 13:56:28 +02:00
Michal Čihař
86baee8d4e Do not apply TESTING/STABLE update to 2.11 branch. 2010-08-20 13:53:01 +02:00
Michal Čihař
176583f4ae Add javascript compressor.
It uses http://code.google.com/closure/compiler/ for now.
2010-04-13 11:41:00 +02:00
Michal Čihař
0ea3a3ea26 Use merge strategy that wil always prefer branch we're marking as STABLE/TESTING.
The problem is in fact that not all branches are merged together and it
usually causes conflicts on version string (documentation, config,
changelog,...). By simply using branch we're merging to STABLE/TESTING
we will get the correct merge.
2010-04-07 09:30:53 +02:00
Michal Čihař
a069d4f4af Merge branch 'master' into gettext 2010-03-24 10:50:11 +01:00