| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2010-06-15 | Fix for ticket #1118. Create a item::save_with_retries helper method, which ↵ | Tim Almdal | |
| encapsulates saving an item and handling name and slug conflicts. Call this instead of doing a save directly. | |||
| 2010-06-15 | Change the item rest update processing to call the item::move(source, ↵ | Tim Almdal | |
| target) helper when the parent member has changed. Using the move method insures that names and slugs that could conflict in the target album are resolved properly. Changed the item::move method so it returns a message to be displayed if the caller chooses. And changed the move controller to display the message returned by the move if the item name was renamed as part of the move. | |||
| 2010-06-15 | Only change the weights of the album children if the item sort_column is set ↵ | Tim Almdal | |
| to weight. | |||
| 2010-06-15 | Revert "Change the item rest update processing to call the ↵ | Tim Almdal | |
| itemm::move(source, target) helper when the parent member has changed. Using the move method insures that names and slugs that could conflict in the target album are resolved properly. Also, only change the weights of the album children if the item sort_column is set to weight." This reverts commit 603d4640141a43350f50da747d747456b28fdd93. | |||
| 2010-06-15 | Change the item rest update processing to call the itemm::move(source, ↵ | Tim Almdal | |
| target) helper when the parent member has changed. Using the move method insures that names and slugs that could conflict in the target album are resolved properly. Also, only change the weights of the album children if the item sort_column is set to weight. | |||
| 2010-06-15 | Add a simple/cheap test to make sure that the database config is ok. Fixes ↵ | Bharat Mediratta | |
| ticket #1029. | |||
| 2010-06-14 | Merge branch 'master' of git@github.com:gallery/gallery3 | Tim Almdal | |
| 2010-06-13 | Replace __CSRF__ with the actual csrf token. | Bharat Mediratta | |
| 2010-06-13 | Change single to double quotes. | Bharat Mediratta | |
| 2010-06-13 | Merge branch 'master' into talmdal_dev | Tim Almdal | |
| 2010-06-12 | Fix up some indentation and comment style. | Bharat Mediratta | |
| 2010-06-12 | Bounce the user to the login page if they try to get to part of the | Bharat Mediratta | |
| admin site as a guest. Also, theme the login/html page. | |||
| 2010-06-12 | Make login/logout continuation url code consistent. Where necessary, | Bharat Mediratta | |
| we specify the continue_url in the session, but we store it in the login form so that we can propagate it across the session creation that happens at login time. | |||
| 2010-06-12 | Use "continue_url" instead of "continue" for consistency with the | Bharat Mediratta | |
| reauth code. | |||
| 2010-06-12 | Push the continue url into the form for consistency with other | Bharat Mediratta | |
| login/continue code. | |||
| 2010-06-12 | Stop trying to parse the continue url in the logout controller because | Bharat Mediratta | |
| it requires us to reproduce a bunch of complex routing logic. Instead, just have the logout link generating code generate a link that's visible to guests. | |||
| 2010-06-12 | Revert "Fix for ticket #1118. The item validation was flagging duplicate ↵ | Bharat Mediratta | |
| slugs as errors. There was already code in the item save to insure that any" This introduces a bug where you can create two items with the same slug. This reverts commit cb01f4017d70a7d73273052b424e8b78b794bc1c. | |||
| 2010-06-11 | Fix for ticket #1118. The item validation was flagging duplicate slugs as ↵ | Tim Almdal | |
| errors. There was already code in the item save to insure that any duplicates were made unique, so this patch removes the validation as unnecessary. | |||
| 2010-06-11 | Fix for ticket #1039. The problem was, as Bryan76 pointed out, with passing ↵ | Tim Almdal | |
| the full url in the continue parameter. In the logout controller, we tried to get the item from the url so we could check the permission of the item to insure that the guest user had access. But url::get_item_from_url expects a relative url. | |||
| 2010-06-11 | Actually execute the database query that updates the album view count. Fixes ↵ | Tim Almdal | |
| ticket #1092. Thanks to shinta for pointing the way. | |||
| 2010-06-11 | Actually execute the database query that updates the album view count. Fixes ↵ | Tim Almdal | |
| ticket #1092. Thanks to shinta for pointing the way. | |||
| 2010-06-10 | Change the pattern used to convert the file name to a title. Fixes ticket#1061 | Tim Almdal | |
| 2010-06-10 | Merge branch 'master' into talmdal_dev | Tim Almdal | |
| 2010-06-09 | Update golden file | Bharat Mediratta | |
| 2010-06-09 | In GalleryCodeFilterIterator::accept(), ignore . and .., and stop caring ↵ | Bharat Mediratta | |
| about .svn | |||
| 2010-06-09 | Fix get_ancestor_test() since the parameter was renamed to ancestors_for. | Bharat Mediratta | |
| 2010-06-09 | Revert the "preserve_ids" global query parameter. We decided that it was a | Bharat Mediratta | |
| bad idea. This reverts commit 6425d41eddd44091b2d83ba3c3734cc6990ca581. | |||
| 2010-06-08 | Add a "can_edit" field to the Item_Model's REST output. It's | Bharat Mediratta | |
| applicable to the current user. | |||
| 2010-06-08 | Don't use the standard error formatting for exceptions that have occurred as ↵ | Tim Almdal | |
| part of a REST request. Format the exception as a json encoded text string so the client can extract the fault information if they so choose. | |||
| 2010-06-07 | Add a "preserve_ids" global query parameter for REST requests that | Bharat Mediratta | |
| indicates that we shouldn't opportunistically convert ids into REST urls. | |||
| 2010-06-07 | Add a "convert_ids" parameter to Item_Model::as_restful_array(), which | Bharat Mediratta | |
| we can turn on with a query parameter. | |||
| 2010-06-07 | Merge branch 'master' into talmdal_dev | Tim Almdal | |
| 2010-06-06 | Don't show the rotate links if the active user can't edit the photo. Fixes ↵ | Bharat Mediratta | |
| ticket #1157. Thanks to psvo. | |||
| 2010-06-06 | Try to adjust for situations where /proc/loadavg is_readable() but | Bharat Mediratta | |
| generates an error if we call file() on it. Fixes ticket #1149. | |||
| 2010-06-06 | Merge branch 'master' into talmdal_dev | Tim Almdal | |
| 2010-06-06 | Fix an unused variable caused by converting straight query params | Bharat Mediratta | |
| to $entity based params. | |||
| 2010-06-06 | Change "ancestor_for" to "ancestors_for" for consistency. | Bharat Mediratta | |
| 2010-06-05 | item::random_query() doesn't need to take a "where" clause because | Bharat Mediratta | |
| it's returning a query, so the caller can add the where clause himself. This makes for a cleaner API. | |||
| 2010-06-05 | Undo the change added in e4eedbce2298535540cb651d75ba6f1bf42cf02b | Bharat Mediratta | |
| which deactivates modules on upgrade. No idea why we did that, but it breaks upgrading because it deactivates any module that's been upgraded. | |||
| 2010-06-05 | Fix a comment typo. | Bharat Mediratta | |
| 2010-06-04 | Correct XSS Security Test golden file for recent changes. Update the ↵ | Tim Almdal | |
| controller_auth data file for the rename of admin_comments to admin_manage_comments. | |||
| 2010-06-04 | Change the name of the private format_restful_item to _format_restful_item ↵ | Tim Almdal | |
| so that the File_Structure_Test will pass. | |||
| 2010-06-04 | Save the item before updating the order of the children. Also always ↵ | Tim Almdal | |
| increment the weight count (even if it is equal to the weight of the current child) | |||
| 2010-06-04 | Allow the use of the type query parameter to filter the results of a ↵ | Tim Almdal | |
| rest/gallery/items?urls=... request. This allows the client to pass the entire list of member urls and have the rest server filter the results based on the specified types. (cherry picked from commit 3fe10b15cf9359b66452c24965df575203e8af8e) | |||
| 2010-06-04 | Remove the item id from the rest/gallery/items url as that was inconsistent. ↵ | Tim Almdal | |
| Add the query parameter ancestors_for=<url> to provide a restful way to retrieve the ancestors of an item. (cherry picked from commit e9c8a8ae532e785ab95e6b43864c93b485785d6c) Conflicts: modules/gallery/helpers/items_rest.php | |||
| 2010-05-28 | If the file is empty (i.e. the upload failed, then throw a 'bad request' ↵ | Tim Almdal | |
| exception before trying to create the item. | |||
| 2010-05-18 | Save the item before updating the order of the children. Also always ↵ | Tim Almdal | |
| increment the weight count (even if it is equal to the weight of the current child) | |||
| 2010-05-15 | Allow the use of the type query parameter to filter the results of a ↵ | Tim Almdal | |
| rest/gallery/items?urls=... request. This allows the client to pass the entire list of member urls and have the rest server filter the results based on the specified types. (cherry picked from commit 3fe10b15cf9359b66452c24965df575203e8af8e) | |||
| 2010-05-15 | Remove the item id from the rest/gallery/items url as that was inconsistent. ↵ | Tim Almdal | |
| Add the query parameter ancestors_for=<url> to provide a restful way to retrieve the ancestors of an item. (cherry picked from commit e9c8a8ae532e785ab95e6b43864c93b485785d6c) Conflicts: modules/gallery/helpers/items_rest.php | |||
| 2010-05-14 | Fix-ups for d98b85f7d3142676e6b4f407a18ed81564823f88 | Bharat Mediratta | |
| - Pass the CSS selector of the active image in as an arg to site_menu so that quick operations know what they're operating on. - Change the ids from g-{photo,movie}-id to the generic g-item-id - Initialize ajax handlers for site menu on the photo and movie page - Drop the movie context menu, it's now in the site menu | |||
 |
index : gallery3.git | |
| A clone of the Gallery3 code for testing and development. | root |
| summaryrefslogtreecommitdiff |