aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* bug 2682: Watermark sizing calculation is made on the requested size not on ↵rvelices2012-07-243-5/+17
| | | | | | the final one (merge from trunk) git-svn-id: http://piwigo.org/svn/branches/2.4@16990 68402e56-0260-453c-a942-63ccdbb3a9ee
* Merged revision(s) 16986-16987 from trunk: refactor code when selected ↵rvelices2012-07-244-29/+23
| | | | | | | | | derivative on index page is changed by a plugin ... fix ie7 display and unwanted text in print git-svn-id: http://piwigo.org/svn/branches/2.4@16988 68402e56-0260-453c-a942-63ccdbb3a9ee
* fix checkbox of selected derivative on index page when a plugin overrides ↵rvelices2012-07-241-1/+1
| | | | | | the default value git-svn-id: http://piwigo.org/svn/branches/2.4@16985 68402e56-0260-453c-a942-63ccdbb3a9ee
* merge r16800 & r16799 from trunk to 2.4 branchflop252012-07-242-5/+28
| | | | | | | | | | | bug:2688 changing padding margin... +10 px for .thumbnailCategory .description using a prefilter __ changing the padding adding a prefilter to a height for .thumbnailCategory .description .text git-svn-id: http://piwigo.org/svn/branches/2.4@16984 68402e56-0260-453c-a942-63ccdbb3a9ee
* [2.4] - /plugins/ - versionddtddt2012-07-243-3/+3
| | | | git-svn-id: http://piwigo.org/svn/branches/2.4@16979 68402e56-0260-453c-a942-63ccdbb3a9ee
* git-svn-id: http://piwigo.org/svn/branches/2.4@16978 ↵ddtddt2012-07-2479-930/+3351
| | | | 68402e56-0260-453c-a942-63ccdbb3a9ee
* Merged revision(s) 16967 from trunk:mistic1002012-07-241-84/+90
| | | | | | update triggers_list and fix display bug git-svn-id: http://piwigo.org/svn/branches/2.4@16968 68402e56-0260-453c-a942-63ccdbb3a9ee
* bug 2705 fixed: if the rotation is "0", no rotation is needed, we skip theplegall2012-07-231-1/+1
| | | | | | | rotate function which behaves badly (in ExtIM) with a zero degree rotation. git-svn-id: http://piwigo.org/svn/branches/2.4@16934 68402e56-0260-453c-a942-63ccdbb3a9ee
* revert bug:2684 on tpl filesflop252012-07-233-22/+6
| | | | git-svn-id: http://piwigo.org/svn/branches/2.4@16930 68402e56-0260-453c-a942-63ccdbb3a9ee
* Merged revision(s) 16928 from trunk:mistic1002012-07-2320-180/+170
| | | | | | | | feature 2703: make it easy for plugins to add tabs in admin screens centralize all core tabs in one file git-svn-id: http://piwigo.org/svn/branches/2.4@16929 68402e56-0260-453c-a942-63ccdbb3a9ee
* Merged revision(s) 16925 from trunk:mistic1002012-07-2318-1/+26
| | | | | | | feature 2703: make it easy for plugins to add tabs in admin screens add a trigger a give an id to each core tabsheets git-svn-id: http://piwigo.org/svn/branches/2.4@16926 68402e56-0260-453c-a942-63ccdbb3a9ee
* merge r16849 form trunk to 2.4flop252012-07-191-0/+0
| | | | | | | | bug:2684 a better gif git-svn-id: http://piwigo.org/svn/branches/2.4@16850 68402e56-0260-453c-a942-63ccdbb3a9ee
* merge r16829 from trunk to 2.4flop252012-07-181-7/+7
| | | | | | | | bug:2698 at the bottom! git-svn-id: http://piwigo.org/svn/branches/2.4@16830 68402e56-0260-453c-a942-63ccdbb3a9ee
* merge r16827 from trunk to 2.4 branchflop252012-07-181-27/+28
| | | | | | | | | | | bug:2698 2 id identical fieldset instead of a span moving up the field for autoorder hiding the link to set a autoorder if there is no album (clicking on it didn't do anything)merge r16825 git-svn-id: http://piwigo.org/svn/branches/2.4@16828 68402e56-0260-453c-a942-63ccdbb3a9ee
* merge r16825 from trunk to 2.4 branchflop252012-07-181-50/+51
| | | | | | | bug:2698 moving the forms git-svn-id: http://piwigo.org/svn/branches/2.4@16826 68402e56-0260-453c-a942-63ccdbb3a9ee
* merge r16801 from trunk to 2.4 branchflop252012-07-171-1/+1
| | | | | | wrong name for the loop : odd/even feature working now git-svn-id: http://piwigo.org/svn/branches/2.4@16802 68402e56-0260-453c-a942-63ccdbb3a9ee
* Merged revision(s) r16655 from trunk:mistic1002012-07-121-1/+1
| | | | | | public colorbox template deprecated git-svn-id: http://piwigo.org/svn/branches/2.4@16656 68402e56-0260-453c-a942-63ccdbb3a9ee
* [2.4] - language - LocalFilesEditor - add zh_TW - 中文 (繁體) - Chinese ↵ddtddt2012-07-113-0/+84
| | | | | | traditional Thanks to chouyh git-svn-id: http://piwigo.org/svn/branches/2.4@16607 68402e56-0260-453c-a942-63ccdbb3a9ee
* merge r16522 from branch 2.4 to trunkflop252012-07-094-12/+20
| | | | | | | | | only load the js for the ajax loading, if one picture needs to be generated bug:2684 git-svn-id: http://piwigo.org/svn/branches/2.4@16523 68402e56-0260-453c-a942-63ccdbb3a9ee
* bug:2683flop252012-07-081-0/+9
| | | | | | create get_size_css git-svn-id: http://piwigo.org/svn/branches/2.4@16507 68402e56-0260-453c-a942-63ccdbb3a9ee
* merge r16504 & r16505 from trunk to branch 2.4flop252012-07-084-4/+17
| | | | | | | | | bug:2684 adding the loader ajax-loader-small.gif for comment_list.tpl, and ajax-loader-big.gif for picture_content.tpl bug:2684 git-svn-id: http://piwigo.org/svn/branches/2.4@16506 68402e56-0260-453c-a942-63ccdbb3a9ee
* merge r16502 from trunk to branch 2.4flop252012-07-082-0/+1
| | | | | | | adding a conf img_dir and a loader : ajax-loader-big.gif 128x128 bug:2684 git-svn-id: http://piwigo.org/svn/branches/2.4@16503 68402e56-0260-453c-a942-63ccdbb3a9ee
* qualify better css exceptions for ie 5-7rvelices2012-07-062-2/+2
| | | | git-svn-id: http://piwigo.org/svn/branches/2.4@16411 68402e56-0260-453c-a942-63ccdbb3a9ee
* Merged revision(s) 16390 from trunk:mistic1002012-07-062-0/+8
| | | | | | | feature 2680: styles for jQuery UI slider still need to include "themes/default/js/ui/theme/jquery.ui.slider.css" git-svn-id: http://piwigo.org/svn/branches/2.4@16391 68402e56-0260-453c-a942-63ccdbb3a9ee
* user_cache was not invalidated on photo deletion (merge from trunk to branch ↵rvelices2012-07-031-0/+1
| | | | | | 2.4) git-svn-id: http://piwigo.org/svn/branches/2.4@16335 68402e56-0260-453c-a942-63ccdbb3a9ee
* [2.4] - language - update language for 2.4.1ddtddt2012-07-031-11/+5
| | | | git-svn-id: http://piwigo.org/svn/branches/2.4@16316 68402e56-0260-453c-a942-63ccdbb3a9ee
* bug 2677 fixed: smarter check of the database version and manage partial ↵plegall2012-07-022-8/+30
| | | | | | upgrade. git-svn-id: http://piwigo.org/svn/branches/2.4@16312 68402e56-0260-453c-a942-63ccdbb3a9ee
* [2.4] - language - update language for 2.4.1ddtddt2012-07-021-0/+1
| | | | git-svn-id: http://piwigo.org/svn/branches/2.4@16303 68402e56-0260-453c-a942-63ccdbb3a9ee
* [2.4] - language - update language for 2.4.1ddtddt2012-07-021-1/+4
| | | | git-svn-id: http://piwigo.org/svn/branches/2.4@16302 68402e56-0260-453c-a942-63ccdbb3a9ee
* [2.4] - language - update language for 2.4.1ddtddt2012-07-0244-917/+1176
| | | | git-svn-id: http://piwigo.org/svn/branches/2.4@16299 68402e56-0260-453c-a942-63ccdbb3a9ee
* bug 2661 fixed: there is no more high_filesize in Piwigo 2.4. We have to ↵plegall2012-07-021-31/+4
| | | | | | remove it from history search. git-svn-id: http://piwigo.org/svn/branches/2.4@16281 68402e56-0260-453c-a942-63ccdbb3a9ee
* Merged revision(s) 16278 from trunk:mistic1002012-07-021-2/+5
| | | | | | bug 2674: cssmin 3.0.1 requires PHP 5.2.4 git-svn-id: http://piwigo.org/svn/branches/2.4@16279 68402e56-0260-453c-a942-63ccdbb3a9ee
* bug 2673 fixed: Batch Manager, single mode, a click on the thumbnail opens ↵plegall2012-07-021-3/+3
| | | | | | the L size and not the original. git-svn-id: http://piwigo.org/svn/branches/2.4@16277 68402e56-0260-453c-a942-63ccdbb3a9ee
* Merged revision(s) 16275 from trunk:mistic1002012-07-021-72/+1
| | | | | | bug 2669: cancel migration task 121 git-svn-id: http://piwigo.org/svn/branches/2.4@16276 68402e56-0260-453c-a942-63ccdbb3a9ee
* next version is 2.4.1plegall2012-07-021-1/+1
| | | | git-svn-id: http://piwigo.org/svn/branches/2.4@16273 68402e56-0260-453c-a942-63ccdbb3a9ee
* bug 2672: invalid option sampling-factor for old versions of ImageMagick ↵rvelices2012-07-011-2/+10
| | | | | | (use it for new versions) merge from trunk to branch 2.4 git-svn-id: http://piwigo.org/svn/branches/2.4@16242 68402e56-0260-453c-a942-63ccdbb3a9ee
* bug 2672: deactivate sampling-factor (for now)plegall2012-06-291-1/+7
| | | | git-svn-id: http://piwigo.org/svn/branches/2.4@16210 68402e56-0260-453c-a942-63ccdbb3a9ee
* merge r16179 from trunkmistic1002012-06-294-13/+4
| | | | | | bug 2671: use get_branch_from_version() to find the real branch, however the version looks like git-svn-id: http://piwigo.org/svn/branches/2.4@16180 68402e56-0260-453c-a942-63ccdbb3a9ee
* merge r16177 from trunkmistic1002012-06-291-1/+10
| | | | | | incompatible plugins check doesn't work since 2.4, because version number format has changed git-svn-id: http://piwigo.org/svn/branches/2.4@16178 68402e56-0260-453c-a942-63ccdbb3a9ee
* bug 2668 - fix php warnings on glob function (merge from trunk to 2.4)rvelices2012-06-292-4/+10
| | | | git-svn-id: http://piwigo.org/svn/branches/2.4@16168 68402e56-0260-453c-a942-63ccdbb3a9ee
* merge r16146 from trunkmistic1002012-06-281-2/+2
| | | | | | check if ilog() exists before using it, allowing the use the class outer i.php git-svn-id: http://piwigo.org/svn/branches/2.4@16147 68402e56-0260-453c-a942-63ccdbb3a9ee
* tabulation is not the expected indentationplegall2012-06-271-5/+5
| | | | git-svn-id: http://piwigo.org/svn/branches/2.4@16083 68402e56-0260-453c-a942-63ccdbb3a9ee
* correctly log errors when external imagick fails (merge from trunk)rvelices2012-06-271-1/+3
| | | | git-svn-id: http://piwigo.org/svn/branches/2.4@16077 68402e56-0260-453c-a942-63ccdbb3a9ee
* bug 2666 Fix invalid xml on web service output with xml format (merge from ↵rvelices2012-06-271-0/+5
| | | | | | trunk to branch 2.4) git-svn-id: http://piwigo.org/svn/branches/2.4@16075 68402e56-0260-453c-a942-63ccdbb3a9ee
* bug 2655 avoid php warning in safe_mode merge from trunk to 2.4rvelices2012-06-271-1/+1
| | | | git-svn-id: http://piwigo.org/svn/branches/2.4@16073 68402e56-0260-453c-a942-63ccdbb3a9ee
* Merged revision 16027 from trunk: Update language ITriopwg2012-06-251-0/+1
| | | | git-svn-id: http://piwigo.org/svn/branches/2.4@16028 68402e56-0260-453c-a942-63ccdbb3a9ee
* merge r15950 from trunkmistic1002012-06-223-14/+30
| | | | | | bug 2659: Possible misconfiguration of ORDER BY + missing language string git-svn-id: http://piwigo.org/svn/branches/2.4@15951 68402e56-0260-453c-a942-63ccdbb3a9ee
* next release is 2.4.0plegall2012-06-221-1/+1
| | | | git-svn-id: http://piwigo.org/svn/branches/2.4@15936 68402e56-0260-453c-a942-63ccdbb3a9ee
* change default configuration settings for a stable branch. Developers who ↵plegall2012-06-221-4/+4
| | | | | | need previous configuration settings can modify them in their local configuration git-svn-id: http://piwigo.org/svn/branches/2.4@15935 68402e56-0260-453c-a942-63ccdbb3a9ee
* Create branch 2.4 from trunk r15931plegall2012-06-220-0/+0
| | | | git-svn-id: http://piwigo.org/svn/branches/2.4@15934 68402e56-0260-453c-a942-63ccdbb3a9ee