Commit graph

3188 commits

Author SHA1 Message Date
rvelices
497203da33 merge r6484 from trunk to branch 2.1
- revert r6473 and r6475
- moved call to event format_exif_data earlier

git-svn-id: http://piwigo.org/svn/branches/2.1@6485 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-07 19:06:20 +00:00
ddtddt
40cab61e1f [branche2.1] add ka_GE thanks to geomagi
git-svn-id: http://piwigo.org/svn/branches/2.1@6481 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-06 20:31:34 +00:00
kiddy-admin
01022adec3 some mistakes deleted
git-svn-id: http://piwigo.org/svn/branches/2.1@6480 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-06 19:10:30 +00:00
vdigital
0b893e238c merge r6478
Fix: Insignificant issue "Scrollbars beside categories thumbnails(with long names)!"
http://piwigo.org/forum/viewtopic.php?id=16041

git-svn-id: http://piwigo.org/svn/branches/2.1@6479 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-06 19:04:34 +00:00
rvelices
30144caeb8 one of my previous merge from trunk was incomplete
git-svn-id: http://piwigo.org/svn/branches/2.1@6477 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-06 18:32:21 +00:00
rvelices
3115673888 merge r6475
previous commit was still not ok
- quick fix (maybe not the cleanest) of regression 2.0 -> 2.1 when displaying metadata on picture page (event called with different input)

git-svn-id: http://piwigo.org/svn/branches/2.1@6476 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-06 10:48:59 +00:00
rvelices
4664661c50 merge r6473 from trunk to branch 2.1
- quick fix (maybe not the cleanest) of regression 2.0 -> 2.1 when displaying metadata on picture page (event called with different input)

git-svn-id: http://piwigo.org/svn/branches/2.1@6474 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-06 10:14:26 +00:00
nikrou
e49ff390d3 Bug 1717 fixed : SQLite: access failure on Admin > Tools > History
hour function doesn't exists
Merge from trunk.

git-svn-id: http://piwigo.org/svn/branches/2.1@6464 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-04 19:39:02 +00:00
plegall
cb00a22449 feture 1712 : backmerge r6454, useless feature. It can be done another way
without changing core code.

git-svn-id: http://piwigo.org/svn/branches/2.1@6460 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-03 18:59:29 +00:00
plegall
cf5075e774 feature 1712: ability to add a CSS class on body
git-svn-id: http://piwigo.org/svn/branches/2.1@6454 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-03 12:48:27 +00:00
rvelices
663c13f39a merge r6437 from trunk to branch 2.1
- do not remove slashes before calling insert_user_comment (homogeneity with update_user_comment and general use of slashes in piwigo)
- when using a modifier on a non array variable use @| instead of | (generated code is simpler and faster)

git-svn-id: http://piwigo.org/svn/branches/2.1@6438 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-01 19:56:07 +00:00
nikrou
cf32601902 Fix html bug : merge from trunk
git-svn-id: http://piwigo.org/svn/branches/2.1@6430 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-31 11:04:01 +00:00
nikrou
bc12301421 Bug 1705 fixed : User cannot add comment with double quotes
Merge from trunk

git-svn-id: http://piwigo.org/svn/branches/2.1@6424 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-29 11:35:26 +00:00
Gotcha
3826af3ba4 Addition of capital letters => [FR]
git-svn-id: http://piwigo.org/svn/branches/2.1@6420 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-29 09:29:32 +00:00
rvelices
d73302db9b - removed multiple definitions of language keys
git-svn-id: http://piwigo.org/svn/branches/2.1@6418 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-29 08:55:42 +00:00
rvelices
f4c16c53eb added a test that $conf['gallery_url'] != http://piwigo.org/demo
git-svn-id: http://piwigo.org/svn/branches/2.1@6412 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-28 20:02:22 +00:00
rvelices
1b90ca1764 - merged the linkroot integration with the existing gallery_url (unique $conf['gallery_url'] used for RSS, mail homepage root in the browse path)
- added an option $conf['debug_mail'] - if set all outgoing mails are saved into local_data_dir

git-svn-id: http://piwigo.org/svn/branches/2.1@6410 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-28 19:55:03 +00:00
rvelices
f0d6ec33ce merge r6402 from trunk
removed unnecessary language key (Controversy) and potential sql fatal error in admin photo rating page

git-svn-id: http://piwigo.org/svn/branches/2.1@6403 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-27 20:28:43 +00:00
plegall
50cd8ed523 bug 1704 fixed: windows needs a specific directory separator when creating
recursive directory.

git-svn-id: http://piwigo.org/svn/branches/2.1@6384 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-27 07:30:03 +00:00
laurent.duretz
74bf86ecc5 Issue 1521 : add linkroot to spacial pages
git-svn-id: http://piwigo.org/svn/branches/2.1@6368 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-26 08:42:52 +00:00
plegall
d40f81502f remove all svn:mergeinfo properties
git-svn-id: http://piwigo.org/svn/branches/2.1@6364 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-26 00:13:40 +00:00
plegall
5488e86ada feature 1697: ability to deactivate the synchronization method to add photos.
git-svn-id: http://piwigo.org/svn/branches/2.1@6361 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-25 22:29:31 +00:00
rvelices
4dd9061a17 admin multi view controller does not use the selected theme css
git-svn-id: http://piwigo.org/svn/branches/2.1@6357 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-25 20:02:03 +00:00
rvelices
7ab2dd2fac merge -r 6355 from trunk
fix bug 1663 : wrong decoding of non Ascii iptc/exif (charset issue)

git-svn-id: http://piwigo.org/svn/branches/2.1@6356 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-25 19:55:28 +00:00
plegall
442005ff0a bug 1672: replace the language key where it's used.
git-svn-id: http://piwigo.org/svn/branches/2.1@6347 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-24 22:17:24 +00:00
Gotcha
4cc3c656a7 cancellation and replacement r6289
Change language key "Note: Only deletes photos added with pLoader" 
bug:1672

git-svn-id: http://piwigo.org/svn/branches/2.1@6345 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-24 22:06:16 +00:00
plegall
d74b3f26f4 merge r6341 from trunk to branch 2.1
Fix incorrect permissions


git-svn-id: http://piwigo.org/svn/branches/2.1@6343 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-24 20:51:03 +00:00
nikrou
01788faeb5 Fix bug 1695 : incorrect boolean to string conversion for SQLite and PostgreSQL database engines merge from trunk
git-svn-id: http://piwigo.org/svn/branches/2.1@6342 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-24 20:44:55 +00:00
plegall
f010502f12 bug 1694 fixed: COMPUTED Exif fields were not displayed on picture.php
git-svn-id: http://piwigo.org/svn/branches/2.1@6338 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-24 20:07:33 +00:00
plegall
098df99cb3 merge r6325 from trunk to branch 2.1
Update language IT


git-svn-id: http://piwigo.org/svn/branches/2.1@6334 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-24 15:49:01 +00:00
plegall
59ab72c480 merge r6317 from trunk to branch 2.1
[trunk][plugins] c13y_upgrade - add HU language


git-svn-id: http://piwigo.org/svn/branches/2.1@6333 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-24 15:46:44 +00:00
plegall
f53bbfe76f merge r6271 from trunk to branch 2.1
git-svn-id: http://piwigo.org/svn/branches/2.1@6332 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-24 15:45:38 +00:00
plegall
49a0af43a3 merge r6268 from trunk to branch 2.1
git-svn-id: http://piwigo.org/svn/branches/2.1@6331 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-24 15:35:39 +00:00
plegall
0cce6721ca merge r6267 from trunk to branch 2.1
git-svn-id: http://piwigo.org/svn/branches/2.1@6330 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-24 15:35:06 +00:00
plegall
500b653333 merge r6266 from trunk to branch 2.1
git-svn-id: http://piwigo.org/svn/branches/2.1@6329 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-24 15:34:29 +00:00
plegall
6d37de58bf merge r6240 from trunk to branch 2.1
small translation bug correction


git-svn-id: http://piwigo.org/svn/branches/2.1@6328 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-24 15:30:46 +00:00
ddtddt
02ba44ef08 remplace special -> tool
git-svn-id: http://piwigo.org/svn/branches/2.1@6327 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-24 14:02:17 +00:00
plegall
e5a564b618 merge r6320 from trunk to branch 2.1
bug 1667 fixed: r6027 was fixing a minor error on tabs for Google Chrome/Safari
BUT was introducing a major visual issue for IE8. Backmerged + adds the -webkit
radius anyway.

This is a quickfix for release 2.1.1, the improved display introduced by nikrou
was nice and it would be better to have it, but working in IE8


git-svn-id: http://piwigo.org/svn/branches/2.1@6323 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-24 11:19:04 +00:00
plegall
128e22b612 bug 1682: r6312 was producing a MySQL error (depending on the MySQL server
version) because a count() implies a group by.

This code change was checked against MySQL 5.0.75, MySQL 5.0.51 (where the
error occured) and SQLite 3.6.22.

git-svn-id: http://piwigo.org/svn/branches/2.1@6321 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-24 11:12:23 +00:00
patdenice
0a2e040ae7 Merge r6318 from trunk to branch 2.1.
$themeconf['id'] hard coded in template class

git-svn-id: http://piwigo.org/svn/branches/2.1@6319 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-24 07:08:16 +00:00
plegall
d1b62c1d58 bug 1685 fixed: typo on identification.php link
git-svn-id: http://piwigo.org/svn/branches/2.1@6313 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-23 23:39:00 +00:00
plegall
b7ed5e6af4 bug 1684 fixed: the test to check availability of the user_infos line was
wrong. I had changed the old db_num_rows > 0 because it was not working with
SQLite. As suggested by nicolas, let's use a simpler trick "count(1)" in the
query itself, this way it should work with any database engine.

I've also removed the while (true) (ugly infinite loop, with a condition for
exit) that was producing an infinite loop for Piwigo installations with 2.0
database model and 2.1 code (before launching upgrade.php)

git-svn-id: http://piwigo.org/svn/branches/2.1@6312 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-23 23:31:58 +00:00
plegall
0786ff3b79 bug 1683 fixed: as soon as an admin modifies the admin>conf>options>guest settings, registration is broken. This is because user_infos.theme/language are emptied (while they should not).
I have also added an "automatic repair" piece of code in get_default_user_info function. This piece of code should be removed for 2.2 with the appropriate migration task.

git-svn-id: http://piwigo.org/svn/branches/2.1@6311 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-23 23:18:59 +00:00
Gotcha
640d9ebccc Change the language key.
Old => "Note: Only deletes photos added with pLoader"
New => "Note: Only deletes photos added with API"
Removal of the old keys in all the languages.
MAJ New key for en_EN & fr_FR
bug:1672

git-svn-id: http://piwigo.org/svn/branches/2.1@6289 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-23 10:14:39 +00:00
Gotcha
1416cc82c8 Correction lang key
"group" => "Group"

git-svn-id: http://piwigo.org/svn/branches/2.1@6280 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-22 10:17:42 +00:00
Gotcha
082801305d merge r6247 from trunk to branch 2.1
git-svn-id: http://piwigo.org/svn/branches/2.1@6279 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-22 10:13:01 +00:00
Gotcha
8f720238fc Addition of capital letters
git-svn-id: http://piwigo.org/svn/branches/2.1@6277 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-22 10:01:38 +00:00
plegall
93ddc4f810 merge r6265 from trunk to branch 2.1
Correct text alignement in .infos, .errors
30px => 53px


git-svn-id: http://piwigo.org/svn/branches/2.1@6276 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-22 09:48:17 +00:00
Gotcha
2e5bda01e6 Merge r6273 correctly
git-svn-id: http://piwigo.org/svn/branches/2.1@6275 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-22 09:45:22 +00:00
Gotcha
2523c42508 Merge r6273
git-svn-id: http://piwigo.org/svn/branches/2.1@6274 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-22 09:43:49 +00:00