1
0
Commit Graph

557 Commits

Author SHA1 Message Date
Bharat Mediratta
094937a3a3 whitespace. 2009-11-27 15:56:06 -08:00
Bharat Mediratta
863146972b Whitespace fix. 2009-11-27 15:55:53 -08:00
Bharat Mediratta
481da56ead Get rid of the specialized photos_3nids controller and use the base
photos controller.  Override photo.html.php to do the simplified
rendering of the image in a lightbox.
2009-11-27 15:36:04 -08:00
Bharat Mediratta
7f3c8db181 Fix indentation. 2009-11-27 15:32:01 -08:00
Bharat Mediratta
a13bf06f36 Change the mods on all files to 644 2009-11-27 15:27:13 -08:00
Bharat Mediratta
6c1c44fbec Can't have a class name that begins with a digit, so rename this back
to theme_3nids.
2009-11-27 15:23:19 -08:00
Bharat Mediratta
9a7f7ff22d Rename "theme_3nids" to "3nids" in module vars. 2009-11-27 15:21:05 -08:00
Bharat Mediratta
1447920592 Revert "Rename "theme_3nids" to just "3nids" since we no longer have a theme_3nids module."
This reverts commit e8302ffcc8.

Conflicts:

	themes/3nids/views/album.html.php
2009-11-27 15:20:17 -08:00
Bharat Mediratta
fe468a6014 Add spaces after commas. 2009-11-27 15:15:03 -08:00
Bharat Mediratta
e8302ffcc8 Rename "theme_3nids" to just "3nids" since we no longer have a theme_3nids module. 2009-11-27 15:14:21 -08:00
Bharat Mediratta
97db9f478e Updated to reflect the fact that we've gotten rid of REST_Controller
Updated for changes in the paginator..
2009-11-27 15:13:17 -08:00
Bharat Mediratta
f9cdd21db0 Normalize code style. 2009-11-27 15:11:10 -08:00
Bharat Mediratta
77dd601c2d Normalize indentation. 2009-11-27 15:04:19 -08:00
Bharat Mediratta
9d36e222cb Clean up indentation and variable naming to closer match G3 standards. 2009-11-27 14:58:01 -08:00
Bharat Mediratta
937b4cb99d Restructure the 3nids theme into a more standard layout. Delete the
tagsmap module with the expectation that any changes/additions will be
merged into the existing tagsmap module.
2009-11-27 14:41:47 -08:00
Bharat Mediratta
6547d54e72 Fix a blown merge and bring calendarview up to date with rWatcher's
changes.
2009-11-26 11:21:51 -08:00
Bharat Mediratta
55f806b754 Merge branch 'master' of git://github.com/rWatcher/gallery3-contrib
Conflicts:
	modules/calendarview/controllers/calendarview.php
	modules/calendarview/libraries/Calendar_Breadcrumb.php
	modules/calendarview/views/kohana_calendar.php
2009-11-26 11:13:21 -08:00
rWatcher
8ca9f9e780 Added a month view and breadcrumbs to album view. 2009-11-27 03:09:40 +08:00
Bharat Mediratta
07bb2625df Beginning framework for the remote module 2009-11-23 22:30:55 -08:00
rWatcher
11153056f1 Code cleanup. 2009-11-18 19:04:47 -05:00
rWatcher
92e97357e5 Translation Fix. 2009-11-18 18:35:31 -05:00
rWatcher
229c488436 Merge commit 'gallery3-contrib/master' 2009-11-18 15:03:53 -05:00
rWatcher
47d1f16b40 Added a month view and breadcrumbs to album view. 2009-11-18 15:03:16 -05:00
Tim Almdal
b1119d82f1 Revert "Add xss_golden files to some modules."
This reverts commit e20cfc8494.
2009-11-18 10:53:02 -08:00
Tim Almdal
e20cfc8494 Add xss_golden files to some modules. 2009-11-18 10:37:31 -08:00
Tim Almdal
984c42edbf Add quotes around the module name 2009-11-18 08:58:57 -08:00
rWatcher
9f2a08411c Merge commit 'gallery3-contrib/master'
Conflicts:
	modules/calendarview/controllers/calendarview.php
2009-11-18 00:33:19 -05:00
Bharat Mediratta
85570acabd Merge branch 'master' of git@github.com:gallery/gallery3-contrib
Conflicts:
	modules/calendarview/controllers/calendarview.php
2009-11-17 15:55:19 -08:00
Bharat Mediratta
99ec99a166 Update to use the new page_type and page_subtype designations. 2009-11-17 14:06:04 -08:00
rWatcher
59648ce716 Move the CSS from the view file into a seperate .css file. 2009-11-18 02:11:19 +08:00
rWatcher
72a1019256 Remove "overlap dates" from calendar view. 2009-11-18 02:11:19 +08:00
Bharat Mediratta
a19d2132b2 Drop unnecessary use of uninitialized $form variable. 2009-11-17 10:04:33 -08:00
rWatcher
3cb8810074 Move the CSS from the view file into a seperate .css file. 2009-11-17 02:44:29 -05:00
rWatcher
8905bd58e3 Remove "overlap dates" from calendar view. 2009-11-17 02:21:09 -05:00
Bharat Mediratta
99a4fdfb1d Merge branch 'master' of git@github.com:gallery/gallery3-contrib 2009-11-15 17:26:05 -08:00
Bharat Mediratta
0f04a97c35 New module that adds an RSS feed that only contains the most recently
added albums.
2009-11-15 17:25:38 -08:00
Tim Almdal
344702fda3 Not sure why, but merging the remote repository and my local required a add and commit of the 3nids theme 2009-11-15 06:50:21 -08:00
Bharat Mediratta
139437eb73 Merge branch 'master' of git://github.com/3nids/gallery3-contrib
Conflicts:
	themes/3nids_theme/3nids/css/jquery.fancybox.css
	themes/3nids_theme/README
	themes/3nids_theme/modules/tagsmap/css/tagsmap.css
	themes/3nids_theme/modules/theme_3nids/helpers/theme_3nids_theme.php
2009-11-14 22:46:46 -08:00
Bharat Mediratta
ac627af7b5 Merge branch 'master' of git://github.com/rWatcher/gallery3-contrib 2009-11-14 22:34:01 -08:00
Bharat Mediratta
ca20babfab Moved night_wind here from the main repo 2009-11-14 20:28:43 -08:00
3nids
e73917a530 Admin config for item title 2009-11-13 08:35:00 +01:00
rWatcher
9e2688a646 Minor update. 2009-11-12 16:07:16 -05:00
rWatcher
c693a2ba72 Updated for new sidebar code. 2009-11-12 15:57:13 -05:00
rWatcher
4a3fd9b1b6 Initial commit of CalendarView module. 2009-11-11 23:04:01 -05:00
3nids
b512961504 Admin config for item title 2009-11-10 08:39:03 +01:00
3nids
2fc2fe5521 Update to last github version 2009-11-10 08:32:15 +01:00
rWatcher
15ea443506 Merge commit 'gallery3-contrib/master' 2009-11-09 13:52:00 -05:00
Bharat Mediratta
952fb4fe73 Add missing closing angle bracket. Fixes ticket #842. 2009-11-08 10:48:19 -08:00
rWatcher
f627e9a407 Merge commit 'gallery3-contrib/master' 2009-11-08 00:44:56 -05:00
rWatcher
898844933b Merge commit 'gallery3-contrib/master'
Conflicts:
	modules/register/models/pending_user.php
2009-11-08 00:44:06 -05:00