aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* one of my previous merge from trunk was incompletervelices2010-06-061-1/+1
| | | | git-svn-id: http://piwigo.org/svn/branches/2.1@6477 68402e56-0260-453c-a942-63ccdbb3a9ee
* merge r6475 rvelices2010-06-061-4/+4
| | | | | | | 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
* merge r6473 from trunk to branch 2.1 rvelices2010-06-062-27/+27
| | | | | | - 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
* Bug 1717 fixed : SQLite: access failure on Admin > Tools > Historynikrou2010-06-043-2/+17
| | | | | | | hour function doesn't exists Merge from trunk. git-svn-id: http://piwigo.org/svn/branches/2.1@6464 68402e56-0260-453c-a942-63ccdbb3a9ee
* feture 1712 : backmerge r6454, useless feature. It can be done another wayplegall2010-06-032-2/+1
| | | | | | without changing core code. git-svn-id: http://piwigo.org/svn/branches/2.1@6460 68402e56-0260-453c-a942-63ccdbb3a9ee
* feature 1712: ability to add a CSS class on body plegall2010-06-032-1/+2
| | | | git-svn-id: http://piwigo.org/svn/branches/2.1@6454 68402e56-0260-453c-a942-63ccdbb3a9ee
* merge r6437 from trunk to branch 2.1rvelices2010-06-015-23/+8
| | | | | | | - 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
* Fix html bug : merge from trunknikrou2010-05-311-4/+5
| | | | git-svn-id: http://piwigo.org/svn/branches/2.1@6430 68402e56-0260-453c-a942-63ccdbb3a9ee
* Bug 1705 fixed : User cannot add comment with double quotesnikrou2010-05-291-1/+1
| | | | | | Merge from trunk git-svn-id: http://piwigo.org/svn/branches/2.1@6424 68402e56-0260-453c-a942-63ccdbb3a9ee
* Addition of capital letters => [FR]Gotcha2010-05-291-2/+2
| | | | git-svn-id: http://piwigo.org/svn/branches/2.1@6420 68402e56-0260-453c-a942-63ccdbb3a9ee
* - removed multiple definitions of language keysrvelices2010-05-2941-250/+3
| | | | git-svn-id: http://piwigo.org/svn/branches/2.1@6418 68402e56-0260-453c-a942-63ccdbb3a9ee
* added a test that $conf['gallery_url'] != http://piwigo.org/demorvelices2010-05-281-0/+4
| | | | git-svn-id: http://piwigo.org/svn/branches/2.1@6412 68402e56-0260-453c-a942-63ccdbb3a9ee
* - merged the linkroot integration with the existing gallery_url (unique ↵rvelices2010-05-2810-74/+62
| | | | | | | | $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
* merge r6402 from trunkrvelices2010-05-2721-25/+3
| | | | | | 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
* bug 1704 fixed: windows needs a specific directory separator when creatingplegall2010-05-272-0/+8
| | | | | | recursive directory. git-svn-id: http://piwigo.org/svn/branches/2.1@6384 68402e56-0260-453c-a942-63ccdbb3a9ee
* Issue 1521 : add linkroot to spacial pageslaurent.duretz2010-05-261-8/+8
| | | | git-svn-id: http://piwigo.org/svn/branches/2.1@6368 68402e56-0260-453c-a942-63ccdbb3a9ee
* remove all svn:mergeinfo propertiesplegall2010-05-260-0/+0
| | | | git-svn-id: http://piwigo.org/svn/branches/2.1@6364 68402e56-0260-453c-a942-63ccdbb3a9ee
* feature 1697: ability to deactivate the synchronization method to add photos.plegall2010-05-2524-34/+100
| | | | git-svn-id: http://piwigo.org/svn/branches/2.1@6361 68402e56-0260-453c-a942-63ccdbb3a9ee
* admin multi view controller does not use the selected theme cssrvelices2010-05-251-7/+0
| | | | git-svn-id: http://piwigo.org/svn/branches/2.1@6357 68402e56-0260-453c-a942-63ccdbb3a9ee
* merge -r 6355 from trunk rvelices2010-05-252-18/+21
| | | | | | 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
* bug 1672: replace the language key where it's used.plegall2010-05-241-1/+1
| | | | git-svn-id: http://piwigo.org/svn/branches/2.1@6347 68402e56-0260-453c-a942-63ccdbb3a9ee
* cancellation and replacement r6289Gotcha2010-05-243-3/+2
| | | | | | | 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
* merge r6341 from trunk to branch 2.1plegall2010-05-247-0/+0
| | | | | | | Fix incorrect permissions git-svn-id: http://piwigo.org/svn/branches/2.1@6343 68402e56-0260-453c-a942-63ccdbb3a9ee
* Fix bug 1695 : incorrect boolean to string conversion for SQLite and ↵nikrou2010-05-243-9/+9
| | | | | | PostgreSQL database engines merge from trunk git-svn-id: http://piwigo.org/svn/branches/2.1@6342 68402e56-0260-453c-a942-63ccdbb3a9ee
* bug 1694 fixed: COMPUTED Exif fields were not displayed on picture.phpplegall2010-05-241-4/+4
| | | | git-svn-id: http://piwigo.org/svn/branches/2.1@6338 68402e56-0260-453c-a942-63ccdbb3a9ee
* merge r6325 from trunk to branch 2.1plegall2010-05-242-43/+44
| | | | | | | Update language IT git-svn-id: http://piwigo.org/svn/branches/2.1@6334 68402e56-0260-453c-a942-63ccdbb3a9ee
* merge r6317 from trunk to branch 2.1plegall2010-05-243-0/+62
| | | | | | | [trunk][plugins] c13y_upgrade - add HU language git-svn-id: http://piwigo.org/svn/branches/2.1@6333 68402e56-0260-453c-a942-63ccdbb3a9ee
* merge r6271 from trunk to branch 2.1plegall2010-05-241-50/+51
| | | | git-svn-id: http://piwigo.org/svn/branches/2.1@6332 68402e56-0260-453c-a942-63ccdbb3a9ee
* merge r6268 from trunk to branch 2.1plegall2010-05-242-11/+11
| | | | git-svn-id: http://piwigo.org/svn/branches/2.1@6331 68402e56-0260-453c-a942-63ccdbb3a9ee
* merge r6267 from trunk to branch 2.1plegall2010-05-242-12/+12
| | | | git-svn-id: http://piwigo.org/svn/branches/2.1@6330 68402e56-0260-453c-a942-63ccdbb3a9ee
* merge r6266 from trunk to branch 2.1plegall2010-05-241-29/+29
| | | | git-svn-id: http://piwigo.org/svn/branches/2.1@6329 68402e56-0260-453c-a942-63ccdbb3a9ee
* merge r6240 from trunk to branch 2.1plegall2010-05-241-1/+1
| | | | | | | small translation bug correction git-svn-id: http://piwigo.org/svn/branches/2.1@6328 68402e56-0260-453c-a942-63ccdbb3a9ee
* remplace special -> toolddtddt2010-05-2418-18/+18
| | | | git-svn-id: http://piwigo.org/svn/branches/2.1@6327 68402e56-0260-453c-a942-63ccdbb3a9ee
* merge r6320 from trunk to branch 2.1plegall2010-05-243-26/+16
| | | | | | | | | | | | 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
* bug 1682: r6312 was producing a MySQL error (depending on the MySQL serverplegall2010-05-241-1/+2
| | | | | | | | | 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
* Merge r6318 from trunk to branch 2.1.patdenice2010-05-241-0/+1
| | | | | | $themeconf['id'] hard coded in template class git-svn-id: http://piwigo.org/svn/branches/2.1@6319 68402e56-0260-453c-a942-63ccdbb3a9ee
* bug 1685 fixed: typo on identification.php linkplegall2010-05-231-1/+1
| | | | git-svn-id: http://piwigo.org/svn/branches/2.1@6313 68402e56-0260-453c-a942-63ccdbb3a9ee
* bug 1684 fixed: the test to check availability of the user_infos line wasplegall2010-05-231-14/+18
| | | | | | | | | | | | 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
* bug 1683 fixed: as soon as an admin modifies the admin>conf>options>guest ↵plegall2010-05-232-0/+43
| | | | | | | | 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
* Change the language key.Gotcha2010-05-2320-20/+3
| | | | | | | | | | 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
* Correction lang keyGotcha2010-05-221-1/+1
| | | | | | "group" => "Group" git-svn-id: http://piwigo.org/svn/branches/2.1@6280 68402e56-0260-453c-a942-63ccdbb3a9ee
* merge r6247 from trunk to branch 2.1Gotcha2010-05-221-1/+1
| | | | git-svn-id: http://piwigo.org/svn/branches/2.1@6279 68402e56-0260-453c-a942-63ccdbb3a9ee
* Addition of capital lettersGotcha2010-05-221-24/+24
| | | | git-svn-id: http://piwigo.org/svn/branches/2.1@6277 68402e56-0260-453c-a942-63ccdbb3a9ee
* merge r6265 from trunk to branch 2.1plegall2010-05-221-1/+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
* Merge r6273 correctlyGotcha2010-05-221-1/+1
| | | | git-svn-id: http://piwigo.org/svn/branches/2.1@6275 68402e56-0260-453c-a942-63ccdbb3a9ee
* Merge r6273Gotcha2010-05-221-1/+1
| | | | git-svn-id: http://piwigo.org/svn/branches/2.1@6274 68402e56-0260-453c-a942-63ccdbb3a9ee
* merge -r6243 from trunkrvelices2010-05-191-1/+1
| | | | | | fix language key in template/menubar_tags.tpl git-svn-id: http://piwigo.org/svn/branches/2.1@6244 68402e56-0260-453c-a942-63ccdbb3a9ee
* multi view plugin can select inactive themesrvelices2010-05-181-1/+3
| | | | git-svn-id: http://piwigo.org/svn/branches/2.1@6236 68402e56-0260-453c-a942-63ccdbb3a9ee
* Create branch 2.1 from trunk r6202plegall2010-05-170-0/+0
| | | | git-svn-id: http://piwigo.org/svn/branches/2.1@6218 68402e56-0260-453c-a942-63ccdbb3a9ee
* git-svn-id: http://piwigo.org/svn/trunk@6202 ↵EricNet2010-05-161-7/+3
| | | | 68402e56-0260-453c-a942-63ccdbb3a9ee