Commit graph

3216 commits

Author SHA1 Message Date
nikrou
c04a906ec4 Bug 1737 fixed : merge from trunk
Concatenation error with POstgreSQL
Simplify same function for SQLite

git-svn-id: http://piwigo.org/svn/branches/2.1@6581 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-22 21:19:17 +00:00
nikrou
1661af7f3f Bug 1738 fixed : merge from trunk
hour function doesn't exists for database other than mysql.

git-svn-id: http://piwigo.org/svn/branches/2.1@6579 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-22 21:01:47 +00:00
rvelices
7629b2723a - better javascript funcs + shorter notation
git-svn-id: http://piwigo.org/svn/branches/2.1@6576 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-22 19:39:12 +00:00
rvelices
5b19405ff2 removed use of fix-khtml.css (I tried Safari and it does not need it)
git-svn-id: http://piwigo.org/svn/branches/2.1@6575 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-22 19:37:56 +00:00
nikrou
913e3a8c41 merge from trunk; remove unused
git-svn-id: http://piwigo.org/svn/branches/2.1@6574 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-22 19:33:33 +00:00
nikrou
32828aa848 Fix html bug : input field must be in a block tag
Merge from trunk

git-svn-id: http://piwigo.org/svn/branches/2.1@6571 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-22 19:07:54 +00:00
plegall
73b5557703 bug 1707 fixed: Piwigo version number always visible in administration homepage
git-svn-id: http://piwigo.org/svn/branches/2.1@6564 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-21 19:44:48 +00:00
josep.torne
02559d73f8 adding iso file for catalan language
git-svn-id: http://piwigo.org/svn/branches/2.1@6563 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-21 16:11:47 +00:00
josep.torne
0ee13a42cf catalan translation fixing a word
git-svn-id: http://piwigo.org/svn/branches/2.1@6562 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-19 21:02:08 +00:00
josep.torne
d1ceb94f9d adding catalan language about.html file
git-svn-id: http://piwigo.org/svn/branches/2.1@6561 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-19 20:59:12 +00:00
nikrou
08ac5408ff Remove useless file
git-svn-id: http://piwigo.org/svn/branches/2.1@6560 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-19 19:56:50 +00:00
ddtddt
08b1094b0c [branche2.1] update TR thanks to Nakre
git-svn-id: http://piwigo.org/svn/branches/2.1@6557 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-19 14:34:48 +00:00
josep.torne
7ce7346116 adding catalan language
git-svn-id: http://piwigo.org/svn/branches/2.1@6556 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-19 11:33:23 +00:00
josep.torne
1a1d098bce adding catalan language
git-svn-id: http://piwigo.org/svn/branches/2.1@6555 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-19 11:21:31 +00:00
nikrou
dbe75d113b Bug 1733 fixed : merge from trunk
single quotes in queries

git-svn-id: http://piwigo.org/svn/branches/2.1@6551 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-17 18:11:11 +00:00
nikrou
5baa3409e5 Bug 1733 fixed : merge from trunk
String values must be delimited by single quotes in queries
Forgot one query

git-svn-id: http://piwigo.org/svn/branches/2.1@6545 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-17 14:50:58 +00:00
nikrou
6067c4ef2b Bug 1733 fixed : merge from trunk
String values must be delimited by single quotes in queries

git-svn-id: http://piwigo.org/svn/branches/2.1@6543 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-17 13:51:52 +00:00
rvelices
2a6e5d0a43 merge r6531 from trunk to branch 2.1
moved content of not-ie.css (1 rule) into theme.css and obsoleted not-ie.css

git-svn-id: http://piwigo.org/svn/branches/2.1@6532 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-15 04:11:33 +00:00
rvelices
49952e574c misplaced closing paranthesis in common.inc.php
git-svn-id: http://piwigo.org/svn/branches/2.1@6524 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-12 09:56:20 +00:00
nikrou
9bbddd0cc4 Bug 1730 fixed : search doesn't work when database engine is not mysql
For posgresql and sqlite date must allways use day and month with two diggits.
merge from trunk

git-svn-id: http://piwigo.org/svn/branches/2.1@6519 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-10 21:08:34 +00:00
ddtddt
406b9bfcd9 [branche2.1] feature:1731 Add Quebec localisation thanks to TiOger
git-svn-id: http://piwigo.org/svn/branches/2.1@6516 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-10 20:02:47 +00:00
nikrou
a59d15b7b6 Fix bug 1722 : PosgtreSQL wants all fields in select to be in Group by clause
or agregate function
Fix issue for lambda function (incorrect number of params)

merge from trunk.

git-svn-id: http://piwigo.org/svn/branches/2.1@6511 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-09 20:26:47 +00:00
rvelices
54fc109f97 merge r6507 from trunk
optim: replace html_options call in picture.tpl with a foreach (html_options loads several smarty files which is overkill for one single use for admins only

git-svn-id: http://piwigo.org/svn/branches/2.1@6508 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-09 19:13:02 +00:00
ddtddt
2848ca55bb [trunk] small bug
git-svn-id: http://piwigo.org/svn/branches/2.1@6504 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-09 18:51:41 +00:00
EricNet
0f6c48d73f git-svn-id: http://piwigo.org/svn/branches/2.1@6503 68402e56-0260-453c-a942-63ccdbb3a9ee 2010-06-09 16:53:13 +00:00
nikrou
a9774635bd Bug 1716 fixed : SQLite: Check upgrades failed in intro
Incorrect use of dependant database function
Fixed same problem in ws functions

merge from trunk

git-svn-id: http://piwigo.org/svn/branches/2.1@6501 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-09 09:57:57 +00:00
nikrou
47847a2dd4 Bug 1715 fixed : SQLite: Add photos fail
must use pwg_db_* functions instead of mysql_* ones
merge from trunk

git-svn-id: http://piwigo.org/svn/branches/2.1@6499 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-09 09:40:34 +00:00
nikrou
de5ded6fa2 Feature 1728 fixed : use autoHeight accordion param
merge from trunk

git-svn-id: http://piwigo.org/svn/branches/2.1@6497 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-09 09:34:49 +00:00
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