stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-06-04 10:49:07 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,668 Commits 4 Branches 0 Tags
ec052d71301acbf519947897f8adda7fdcf7fefb
Commit Graph

3624 Commits

Author SHA1 Message Date
Tim Almdal
2852161ca3 Provide some clarity on the action links by formating them as buttons on 
the Maintenance Tasks admin page.
 2009-07-07 21:49:54 -07:00
Bharat Mediratta
74d4a4c0fd Merge branch 'master' of git@github.com:/gallery/gallery3 2009-07-07 21:20:37 -07:00
Bharat Mediratta
faabae5dae Rework server_add. It's smaller and leaner now, storing the list of 
files out in a separate model for scalability.  Removed the "pause"
functionality.

- Server_Add_Controller extends Admin_Controller so that we don't have
  to check for admin every time.
- Task completion time now factors in the time it takes to walk the
  arbitrarily deep trees
- Moved checkbox management entirely into JS using jQuery
- Simplified the JS considerably
 2009-07-07 21:20:24 -07:00
Andy Staudacher
67e61d30e5 More fixes for ticket 470 (capitalization of reCAPTCHA) 2009-07-07 13:08:35 -07:00
Tim Almdal
5d9e334fe6 Added a wee bit of phpDoc. 
Changed the name of the method get_task_log to get_log
Changed the default name of the file when the log is downloaded to
gallery3_task_log.txt
 2009-07-07 12:49:21 -07:00
Tim Almdal
e5cd7052e8 Revert "Forgot this when i was cleaning up for ticket #519" 
This reverts commit 31969a1d82.
 2009-07-07 12:25:19 -07:00
Tim Almdal
72ebc2fb34 Merge branch 'master' of git@github.com:gallery/gallery3 
Conflicts:
	modules/g2_import/helpers/g2_import.php
 2009-07-07 12:17:38 -07:00
Tim Almdal
b0cd0a52be Allow the task::log method to take an array of lines and change g2_import.php 
helper to use this approach.
 2009-07-07 12:10:50 -07:00
Tim Almdal
31969a1d82 Forgot this when i was cleaning up for ticket #519 2009-07-07 12:09:55 -07:00
Bharat Mediratta
4e0848a1a5 Clean up some indentation. 2009-07-07 11:22:13 -07:00
Tim Almdal
b59e94e7dc Change references to Gallery 2 and Gallery 3 to consistently refer to 
Gallery n as opposed any variants of this.
 2009-07-07 07:32:36 -07:00
Tim Almdal
493fb27825 Cleanup remove task processing. Change Task_Model::delete to call parent::delete 
instead of parent::save. :-) Also change admin_maintenance_controller to delete
via looping over all of the completed tasks and delete individually, so we can
delete the associated cache entries at the same time.
 2009-07-06 22:20:04 -07:00
Tim Almdal
6588f3bbd1 Change wording of failed to import tags to make it consistent with the other failed import messages. Thanks shai 2009-07-06 21:46:50 -07:00
Tim Almdal
dfc704516a correct spacing in a message. thanks shai 2009-07-06 21:10:59 -07:00
Tim Almdal
dff0ffc4f5 Fix for tickets #312 and #370. Added a task logging api. Changed g2_import 
to write all activity to the "log file".  The "log file" is stored in the
persistent cache.
 2009-07-06 20:05:35 -07:00
Bharat Mediratta
30aa065013 Don't use jQuery in the error page, it interferes with the jquery lib 
in the outer page when we load it in a dialog context.
 2009-07-06 12:41:54 -07:00
Tim Almdal
6dbd36d1cc Always log the task completion status message 2009-07-06 10:29:55 -07:00
Tim Almdal
f381927ec6 Catch exceptions that are thrown within the task and log them to the task log 
and then set the task to done, the state to error and the status message set
to the Exception Message.
 2009-07-06 07:39:36 -07:00
Tim Almdal
04f02b49c5 Add task logging functionality. When a task runs, it creates a log that is 
stored in the persistant cache for 30 days.  On the admin_maintenance page
there is a new link for completed tasks "browse log".  Clicking this will
open a dialog box that has the the contents of the log displayed.

The user can then view the log and close the dialog, or press the save button
to download the log to their local machine.
 2009-07-05 17:38:49 -07:00
Tim Almdal
fcb031c2b6 Rename the get_url function in organize.js so that it doesn't collide with the 
one in server_add
 2009-07-04 22:47:43 -07:00
Tim Almdal
85de208879 Lets try the BBCode conversion again... go with basic tags even if some are 
deprecated.
 2009-07-04 20:30:13 -07:00
Tim Almdal
4f0b4469f9 Forgot this file when i was fixing #477 2009-07-04 17:33:10 -07:00
Tim Almdal
50462edd9c Change the BBCode Transformation to use the <span class=""> where possible 2009-07-04 17:14:21 -07:00
Tim Almdal
799d82fd6a Revert "Change the bbcode transformation to more standard tags that can be" 
This reverts commit 4ba022438e.
 2009-07-04 17:01:47 -07:00
Tim Almdal
4ba022438e Change the bbcode transformation to more standard tags that can be 
easily style via css
 2009-07-04 16:18:48 -07:00
Tim Almdal
0f9bfbdd57 Use TMPPATH in the purifier config instead of var/tmp 2009-07-04 09:10:03 -07:00
Tim Almdal
7a9a4b9e8b Found another place that p:purify was required. 
Generalize the dynamic.html so it doesn't require a tag element
 2009-07-04 09:00:11 -07:00
Tim Almdal
d6648c0aff Fix for ticket #477. Use nl2br method when rendering comment::text and 
item::description.  In addition add p::clean or p::purify to places that
xss cleaning had missed (i.e. rss feeds)
 2009-07-04 08:17:12 -07:00
Tim Almdal
54ffea2419 Split the clean method into two clean and purify. clean is a light weight 
approach using html::specialchars and purify uses HTMLPurifier to intelligently
cleanse the output fields. Use purifier for text and title fields where it is
likely that a user would enter html to format their data.
 2009-07-03 21:44:10 -07:00
Bharat Mediratta
22b2e1044f Merge branch 'master' of git@github.com:/gallery/gallery3 2009-07-03 18:09:02 -07:00
Andy Staudacher
a633c134b7 Ticket 104: Adding "Copy sourc text" button to l10n UI (usability / productivity improvement) 2009-07-03 16:14:05 -07:00
Andy Staudacher
fb472da0ba Ignore lib/ folders in l10n_scanner task. 
1. Because it makes sense.
2. As a quick fix - For some reason it wouldn't work properly anymore now with the HTMLPurifier lib
 2009-07-03 16:11:17 -07:00
Andy Staudacher
bafbe5a2d2 Fix for ticket 510: i18n fixes - localize module / theme name in some status messages 2009-07-03 14:58:33 -07:00
Tim Almdal
f6d847739a Update the source so the third party code passes the File Structure Test 2009-07-03 14:18:45 -07:00
Tim Almdal
8d5900f639 Fix for ticket #400: Add HTMLPurifier to gallery3 and change p::clean() to call HTMLPurifier->purify() 2009-07-03 12:56:59 -07:00
Tim Almdal
b6e5bf6eaa Fix for ticket #400: Add HTMLPurifier to gallery3 and change p::clean() to call HTMLPurifier->purify() 2009-07-03 12:56:29 -07:00
Bharat Mediratta
715d714ade Merge branch 'master' of git@github.com:/gallery/gallery3 2009-07-03 09:26:31 -07:00
Tim Almdal
cf279fc315 Fix for #364 = G2 Import Doesn't support markup 
Create a _transform_bbcode which coverts the g2 bbcode to html.
The html won't be rendered until ticket #400 is implemented as
pclean() excapse the html
 2009-07-03 08:14:28 -07:00
Bharat Mediratta
bd1b2f4147 Merge branch 'master' of git@github.com:/gallery/gallery3 2009-07-03 04:48:54 -07:00
Tim Almdal
85ea66d51e Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-02 20:52:55 -07:00
Andy Staudacher
72281d2b44 Fix for ticket 470. Replace ReCaptcha with reCAPTCHA in user visible strings. 2009-07-02 20:50:29 -07:00
Andy Staudacher
93e9efed97 Use Unicode characters (looks better to translator, and fixes normalization issue in translation server) 2009-07-02 20:49:47 -07:00
Tim Almdal
adb820e37c Fix for ticket #359 and a partial fix for ticket #345. 
In G2, text strings have the &, ", < and > replaced by &amp;, &quote;,
&lt; and &gt; respectively.  Created the _decode_html_special_chars
method in helpers/g2_import.php to revert these character strings.
 2009-07-02 20:48:47 -07:00
Bharat Mediratta
eb5538d135 Merge branch 'master' of git@github.com:/gallery/gallery3 
Conflicts:
	modules/server_add/controllers/admin_server_add.php
 2009-07-02 18:00:22 -07:00
Bharat Mediratta
1a5fe42b55 Temporary version add() that just dumps out the values for now. 2009-07-02 17:54:48 -07:00
Bharat Mediratta
9eee3b07a8 @todo if we uncheck all the children for a parent, we should uncheck the 
parent itself, otherwise in the code we'll add the entire parent since if
we find an album as a leaf, we assume that it's never been expanded in the UI.
 2009-07-02 17:54:22 -07:00
Bharat Mediratta
1cd321901b Properly manage disabled state for the [add] button. 2009-07-02 13:02:26 -07:00
Bharat Mediratta
d4075a4657 Only enable the [add] button when boxes are checked. 2009-07-02 11:49:45 -07:00
Bharat Mediratta
a619bb8196 Add some jsDoc. 2009-07-02 11:30:21 -07:00
Bharat Mediratta
e5b6193b26 Partial pass of server_add cleanup. It's broken at this stage since 
I've redone the browsing code but I have not implemented the adding
code.

1) Rename index() to browse() since index is too generic.
2) Simplify the data that we pass to _dialog and _tree
3) Change _tree to return list items only, so that the outer dialog
   can be a <ul> for consistency.
4) Simplify the data structures so that we're not tracking checked vs.
   unchecked status in the PHP code, it's all done in jquery where we
   can do it with just a line or two of JS
5) use glob() which pretty much entirely replaces _get_children
 2009-07-02 11:23:40 -07:00