1
0
Commit Graph

918 Commits

Author SHA1 Message Date
Tim Almdal
1349000336 Merge branch 'master' into talmdal 2010-08-09 06:53:34 -07:00
dmolavi
e94df5cdd0 trying to recommit the deletion of old files. 2010-08-08 15:33:21 -04:00
dmolavi
435b677141 old files no longer needed. 2010-08-08 14:27:38 -04:00
dmolavi
af883743e0 fix to only show on photo item pages. see http://bit.ly/90FxWm 2010-08-08 14:18:41 -04:00
Bharat Mediratta
cf37aa5ceb Add support for replacing an item's data file. 2010-08-08 01:13:32 -07:00
dmolavi
8562a1abc3 commit of funtioning ecard module with post-RC2 changes. 2010-08-07 12:35:17 -07:00
Tim Almdal
011a0c0a89 Merge branch 'master' into talmdal 2010-08-06 14:44:40 -07:00
Tim Almdal
9618dc7644 Merge branch 'talmdal' of github.com:gallery/gallery3-contrib into talmdal
Conflicts:
	modules/themeroller/controllers/admin_themeroller.php
	modules/themeroller/helpers/themeroller_event.php
	modules/themeroller/views/site_screen.css.php
2010-08-06 14:43:57 -07:00
Tim Almdal
e51496abf9 Initial commit of the themeroller module. It takes an upload of the zip file produced by jqueryui.com/themeroller and generates a theme based on the color schema contained in the zip file. Still fairly experimental 2010-08-06 14:29:42 -07:00
Bharat Mediratta
0a69d925dc Sharephoto module from vallu (http://gallery.menalto.com/node/97234) 2010-08-05 11:35:23 -07:00
Bharat Mediratta
6dd078a38f Replace straight SQL with db::build() which takes care of the problem that the table name is not wrapped in curly braces so it won't get prefixed properly 2010-08-05 11:27:11 -07:00
hukoeth
da3978cc03 Fixed parsing error and hidden core and identity provider modules. 2010-08-05 11:23:28 -07:00
hukoeth
b7e991a5a5 navcarousel updated to 4.2
removed reference to a file no longer existing
made load event configurable (document.ready vs. window.load)
2010-08-05 11:23:20 -07:00
hukoeth
fa134d1313 Added moduleorder and navcarousel 2010-08-05 11:23:12 -07:00
Bharat Mediratta
d917430aec Did a pass over the ecard code. It still doesn't work, but it's a lot
closer to our regular style now.  And a fair bit simpler.

Structural
- Added an installer and moved all the default messages into it
  so that they're part of the install process.
- Got rid of the model; you don't need to add an ecard entry in
  the database to send an ecard.  You just need to send a mail.
- Renamed the form and controller methods to reflect the fact that
  we're sending an ecard, not adding an ecard to the db.
- Stopped inlining all of the code into the page like we do in
  comments, and instead put it into a dialog box with a button
  in the sidebar.  This lets us ditch the extra .js and .css and
  greatly simplifies the code.

General
- Added rules to the send_ecard form so that the validation
  code has something to chew on.
- Renamed ecard::can_ecard() to ecard::can_send_ecard() cause you
  should have a verb in there.
- Moved the can_send_ecard() check into ecard_theme::sidebar_bottom
  and out of ecards.html.php

Style cleanup
- Changed "Title Casing" to "Sentence casing" everywhere for
  consistency with our style.
- Cleaned up some indentation
- Got rid of carriage returns

LEFT TO DO:
1) Rename Ecards_Controller to Ecard_Controller for consistency (and
   put it in ecard.php)

2) Actually have it send the ecard :-)
2010-08-03 23:13:40 -07:00
Bharat Mediratta
6e38f07e9c Initial version of eCard from dmolavi, with carriage returns removed. 2010-08-03 22:45:30 -07:00
Bharat Mediratta
1c1e9ad920 Merge branch 'dialog' of github.com:gallery/gallery3-contrib into dialog 2010-08-01 10:24:10 -07:00
Bharat Mediratta
351a9d16b3 Force the respose type to be text/html to avoid the bug where the
buffering iframe doesn't know what to do with a JSON reply.

Print out an appropriate message after the upload completes.
2010-08-01 10:23:57 -07:00
Tim Almdal
1f01b0671f Merge branch 'master' into dialog 2010-08-01 08:34:04 -07:00
Bharat Mediratta
8eec328a06 Change json::reply calls to use "html" instead of "form" and not JSON
encode HTML payloads when we don't need to.

This is follow on for:
7607e1f932
2010-07-31 21:32:59 -07:00
Bharat Mediratta
b4f2c13dcb Updated to reflect the API change in 48af5e6b5039839f93345bef92e1acf7952c50a1 2010-07-31 14:41:04 -07:00
Tim Almdal
e87c6a2832 Change the html_uploader module to use the json::reply. The json reply is not being picked up properly. 2010-07-27 21:48:28 -07:00
Tim Almdal
b3861219f1 Merge branch 'master' into dialog 2010-07-27 21:37:01 -07:00
Bharat Mediratta
0ebe0bc6ef Revert "font changes"
This reverts commit 3a0780dcac.
2010-07-26 12:42:09 -07:00
Bharat Mediratta
77f352725e Merge branch 'master' of github.com:gallery/gallery3-contrib 2010-07-26 11:50:52 -07:00
Bharat Mediratta
3285ca8311 Revert "add support to DownloadAlbum module"
This reverts commit f591f22029.
2010-07-26 11:50:33 -07:00
Bharat Mediratta
41bab777fa Revert "custom tweak for DisplayTag module"
This reverts commit f5f8696e29.
2010-07-26 11:50:24 -07:00
Bharat Mediratta
6771af8744 Revert "the Arabic logo"
This reverts commit d30790c58a.
2010-07-26 11:49:38 -07:00
Tim Almdal
6e4719774f remove debugging statement 2010-07-26 11:06:47 -07:00
Tim Almdal
a8c232a752 Convert the favorites module to the new json::reply helper. **Note** this module doesn't install as it gets a ORM validation error. 2010-07-26 10:58:55 -07:00
Tim Almdal
115ae046a4 Convert the favorites module to the new json::reply helper. 2010-07-26 10:55:52 -07:00
Tim Almdal
43c53845db Convert the gwtorganize module to the new json::reply helper. 2010-07-26 10:55:20 -07:00
Tim Almdal
95757edaa1 Convert the developer module to the new json::reply helper. 2010-07-26 10:46:52 -07:00
Tim Almdal
cce12b602c Convert the scheduler module to the new json::reply helper. 2010-07-26 10:36:32 -07:00
Tim Almdal
b5b770cd1b Convert the register module to use the json::reply(...) helper. 2010-07-26 10:08:19 -07:00
Romain LE DISEZ
56d487b000 Workaround for a MSIE bug (see http://support.microsoft.com/kb/323308/en-us) 2010-07-24 21:51:22 +08:00
Romain LE DISEZ
ab0e8455b6 Workaround for PHP bug 45028 2010-07-24 21:51:22 +08:00
mamouneyya
f591f22029 add support to DownloadAlbum module 2010-07-24 21:48:31 +08:00
mamouneyya
3a0780dcac font changes 2010-07-24 21:48:31 +08:00
mamouneyya
f5f8696e29 custom tweak for DisplayTag module 2010-07-24 21:48:30 +08:00
mamouneyya
d30790c58a the Arabic logo 2010-07-24 06:45:50 -07:00
mamouneyya
acff910a11 the Arabic logo 2010-07-24 06:45:43 -07:00
Bharat Mediratta
9f2853bc7f Merge branch 'master' of git://github.com/mamouneyya/gallery3-contrib 2010-07-24 06:41:26 -07:00
Bharat Mediratta
2d23f87e97 Handle 201 Created. Part of the fix for ticket #1178. 2010-07-24 06:39:40 -07:00
Tim Almdal
33c1f8526a Merge branch 'master' of https://github.com/gallery/gallery3-contrib 2010-07-23 23:09:50 -07:00
Tim Almdal
d88688c074 Fix for ticket #1242. Don't try to initialize the tag_cloud.swf file if there are no tags present. 2010-07-23 07:29:47 -07:00
mamouneyya
d922027213 add support to DownloadAlbum module 2010-07-22 15:12:59 +03:00
mamouneyya
52c85de94e slight color modifications 2010-07-22 13:04:54 +03:00
mamouneyya
6f29c5c742 remove 'admin' from the name to make it consistant with Wind theme 2010-07-22 13:04:13 +03:00
mamouneyya
fecd7c8087 Merge remote branch 'gallery3-contrib/master' 2010-07-22 12:58:49 +03:00