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 |
|
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
|
47d1f16b40
|
Added a month view and breadcrumbs to album view.
|
2009-11-18 15:03:16 -05: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
|
3cb8810074
|
Move the CSS from the view file into a seperate .css file.
|
2009-11-17 02:44:29 -05:00 |
|
rWatcher
|
4a3fd9b1b6
|
Initial commit of CalendarView module.
|
2009-11-11 23:04:01 -05:00 |
|