8197cd440f
fix checkbox of selected derivative on index page when a plugin overrides the default value
...
git-svn-id: http://piwigo.org/svn/branches/2.4@16985 68402e56-0260-453c-a942-63ccdbb3a9ee
2012-07-24 19:13:44 +00:00
37b4b3e0f3
merge r16800 & r16799 from trunk to 2.4 branch
...
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
2012-07-24 18:09:45 +00:00
881dfec74c
[2.4] - /plugins/ - version
...
git-svn-id: http://piwigo.org/svn/branches/2.4@16979 68402e56-0260-453c-a942-63ccdbb3a9ee
2012-07-24 16:53:52 +00:00
9d5015d79e
git-svn-id: http://piwigo.org/svn/branches/2.4@16978 68402e56-0260-453c-a942-63ccdbb3a9ee
2012-07-24 16:52:08 +00:00
3fa99f57d4
Merged revision(s) 16967 from trunk:
...
update triggers_list and fix display bug
git-svn-id: http://piwigo.org/svn/branches/2.4@16968 68402e56-0260-453c-a942-63ccdbb3a9ee
2012-07-24 09:43:35 +00:00
83cdc8576d
bug 2705 fixed: if the rotation is "0", no rotation is needed, we skip the
...
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
2012-07-23 13:33:55 +00:00
2c41131194
revert bug:2684 on tpl files
...
git-svn-id: http://piwigo.org/svn/branches/2.4@16930 68402e56-0260-453c-a942-63ccdbb3a9ee
2012-07-23 12:05:14 +00:00
18bf888d16
Merged revision(s) 16928 from trunk:
...
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
2012-07-23 11:52:18 +00:00
798de81516
Merged revision(s) 16925 from trunk:
...
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
2012-07-23 10:06:27 +00:00
3f51676bfe
merge r16849 form trunk to 2.4
...
bug:2684
a better gif
git-svn-id: http://piwigo.org/svn/branches/2.4@16850 68402e56-0260-453c-a942-63ccdbb3a9ee
2012-07-19 17:06:10 +00:00
b874181e8b
merge r16829 from trunk to 2.4
...
bug:2698
at the bottom!
git-svn-id: http://piwigo.org/svn/branches/2.4@16830 68402e56-0260-453c-a942-63ccdbb3a9ee
2012-07-18 16:37:15 +00:00
2b25eee744
merge r16827 from trunk to 2.4 branch
...
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
2012-07-18 16:23:51 +00:00
d73149b77e
merge r16825 from trunk to 2.4 branch
...
bug:2698
moving the forms
git-svn-id: http://piwigo.org/svn/branches/2.4@16826 68402e56-0260-453c-a942-63ccdbb3a9ee
2012-07-18 14:35:17 +00:00
aecd0d9a80
merge r16801 from trunk to 2.4 branch
...
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
2012-07-17 14:00:25 +00:00
72eac3862d
Merged revision(s) r16655 from trunk:
...
public colorbox template deprecated
git-svn-id: http://piwigo.org/svn/branches/2.4@16656 68402e56-0260-453c-a942-63ccdbb3a9ee
2012-07-12 16:50:56 +00:00
a1a035a4eb
[2.4] - language - LocalFilesEditor - add zh_TW - 中文 (繁體) - Chinese traditional Thanks to chouyh
...
git-svn-id: http://piwigo.org/svn/branches/2.4@16607 68402e56-0260-453c-a942-63ccdbb3a9ee
2012-07-11 07:52:09 +00:00
14b5e43107
merge r16522 from branch 2.4 to trunk
...
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
2012-07-09 08:03:44 +00:00
d3f5ed2c2d
bug:2683
...
create get_size_css
git-svn-id: http://piwigo.org/svn/branches/2.4@16507 68402e56-0260-453c-a942-63ccdbb3a9ee
2012-07-08 17:15:40 +00:00
fa373d27ca
merge r16504 & r16505 from trunk to branch 2.4
...
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
2012-07-08 17:02:11 +00:00
b5025b2947
merge r16502 from trunk to branch 2.4
...
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
2012-07-08 15:50:56 +00:00
077c076069
qualify better css exceptions for ie 5-7
...
git-svn-id: http://piwigo.org/svn/branches/2.4@16411 68402e56-0260-453c-a942-63ccdbb3a9ee
2012-07-06 18:43:33 +00:00
b8507b5afe
Merged revision(s) 16390 from trunk:
...
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
2012-07-06 08:50:53 +00:00
d7a1ee188d
user_cache was not invalidated on photo deletion (merge from trunk to branch 2.4)
...
git-svn-id: http://piwigo.org/svn/branches/2.4@16335 68402e56-0260-453c-a942-63ccdbb3a9ee
2012-07-03 20:21:09 +00:00
812ec7aeee
[2.4] - language - update language for 2.4.1
...
git-svn-id: http://piwigo.org/svn/branches/2.4@16316 68402e56-0260-453c-a942-63ccdbb3a9ee
2012-07-03 04:55:51 +00:00
b85adcaa73
bug 2677 fixed: smarter check of the database version and manage partial upgrade.
...
git-svn-id: http://piwigo.org/svn/branches/2.4@16312 68402e56-0260-453c-a942-63ccdbb3a9ee
2012-07-02 22:28:07 +00:00
968d32fde2
[2.4] - language - update language for 2.4.1
...
git-svn-id: http://piwigo.org/svn/branches/2.4@16303 68402e56-0260-453c-a942-63ccdbb3a9ee
2012-07-02 21:11:45 +00:00
8d8d9332bf
[2.4] - language - update language for 2.4.1
...
git-svn-id: http://piwigo.org/svn/branches/2.4@16302 68402e56-0260-453c-a942-63ccdbb3a9ee
2012-07-02 21:09:07 +00:00
364f1a562e
[2.4] - language - update language for 2.4.1
...
git-svn-id: http://piwigo.org/svn/branches/2.4@16299 68402e56-0260-453c-a942-63ccdbb3a9ee
2012-07-02 20:12:56 +00:00
64bc6e3f17
bug 2661 fixed: there is no more high_filesize in Piwigo 2.4. We have to remove it from history search.
...
git-svn-id: http://piwigo.org/svn/branches/2.4@16281 68402e56-0260-453c-a942-63ccdbb3a9ee
2012-07-02 13:30:33 +00:00
787c716b66
Merged revision(s) 16278 from trunk:
...
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
2012-07-02 13:09:09 +00:00
a07dd0bea0
bug 2673 fixed: Batch Manager, single mode, a click on the thumbnail opens the L size and not the original.
...
git-svn-id: http://piwigo.org/svn/branches/2.4@16277 68402e56-0260-453c-a942-63ccdbb3a9ee
2012-07-02 12:59:12 +00:00
06a66c406e
Merged revision(s) 16275 from trunk:
...
bug 2669: cancel migration task 121
git-svn-id: http://piwigo.org/svn/branches/2.4@16276 68402e56-0260-453c-a942-63ccdbb3a9ee
2012-07-02 10:54:15 +00:00
5d9fc3066d
next version is 2.4.1
...
git-svn-id: http://piwigo.org/svn/branches/2.4@16273 68402e56-0260-453c-a942-63ccdbb3a9ee
2012-07-02 07:46:35 +00:00
3aa529809e
bug 2672: invalid option sampling-factor for old versions of ImageMagick (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
2012-07-01 04:18:34 +00:00
9ee698734d
bug 2672: deactivate sampling-factor (for now)
...
git-svn-id: http://piwigo.org/svn/branches/2.4@16210 68402e56-0260-453c-a942-63ccdbb3a9ee
2012-06-29 22:23:49 +00:00
e21e16e76e
merge r16179 from trunk
...
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
2012-06-29 15:10:09 +00:00
aa10f54558
merge r16177 from trunk
...
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
2012-06-29 14:31:29 +00:00
f3c84114ef
bug 2668 - fix php warnings on glob function (merge from trunk to 2.4)
...
git-svn-id: http://piwigo.org/svn/branches/2.4@16168 68402e56-0260-453c-a942-63ccdbb3a9ee
2012-06-29 04:26:22 +00:00
de1166c7f2
merge r16146 from trunk
...
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
2012-06-28 18:47:34 +00:00
457a627c29
tabulation is not the expected indentation
...
git-svn-id: http://piwigo.org/svn/branches/2.4@16083 68402e56-0260-453c-a942-63ccdbb3a9ee
2012-06-27 07:01:01 +00:00
e1794bbb66
correctly log errors when external imagick fails (merge from trunk)
...
git-svn-id: http://piwigo.org/svn/branches/2.4@16077 68402e56-0260-453c-a942-63ccdbb3a9ee
2012-06-27 04:20:29 +00:00
9f809077e0
bug 2666 Fix invalid xml on web service output with xml format (merge from trunk to branch 2.4)
...
git-svn-id: http://piwigo.org/svn/branches/2.4@16075 68402e56-0260-453c-a942-63ccdbb3a9ee
2012-06-27 04:09:54 +00:00
9937863533
bug 2655 avoid php warning in safe_mode merge from trunk to 2.4
...
git-svn-id: http://piwigo.org/svn/branches/2.4@16073 68402e56-0260-453c-a942-63ccdbb3a9ee
2012-06-27 03:55:48 +00:00
45e75a4a92
Merged revision 16027 from trunk: Update language IT
...
git-svn-id: http://piwigo.org/svn/branches/2.4@16028 68402e56-0260-453c-a942-63ccdbb3a9ee
2012-06-25 06:35:27 +00:00
86358b6c87
merge r15950 from trunk
...
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
2012-06-22 21:42:52 +00:00
015e2f5ac8
next release is 2.4.0
...
git-svn-id: http://piwigo.org/svn/branches/2.4@15936 68402e56-0260-453c-a942-63ccdbb3a9ee
2012-06-22 08:57:49 +00:00
d5dc1ee06d
change default configuration settings for a stable branch. Developers who 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
2012-06-22 08:56:58 +00:00
50fa94a710
Create branch 2.4 from trunk r15931
...
git-svn-id: http://piwigo.org/svn/branches/2.4@15934 68402e56-0260-453c-a942-63ccdbb3a9ee
2012-06-22 08:50:29 +00:00
efad6b0fa9
[localfileseditor] Update tr_TR, thanks to : LazBoy
...
git-svn-id: http://piwigo.org/svn/trunk@15931 68402e56-0260-453c-a942-63ccdbb3a9ee
2012-06-21 19:45:48 +00:00
5ae74aac04
on comment_list add link to exit from comment edition
...
git-svn-id: http://piwigo.org/svn/trunk@15924 68402e56-0260-453c-a942-63ccdbb3a9ee
2012-06-21 13:39:25 +00:00
rvelices