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
Chad Kieffer
24ad098f23
Merge branch 'master' of github.com:gallery/gallery3-contrib
2009-11-26 11:12:01 -07:00
Bharat Mediratta
07bb2625df
Beginning framework for the remote module
2009-11-23 22:30:55 -08:00
Chad Kieffer
6d8f000ccc
Merge branch 'master' of github.com:gallery/gallery3-contrib
2009-11-18 19:04:34 -07: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
Chad Kieffer
26edee8350
Remove g-actions, it doesn't serve any real purpose in styling or JavaScript.
2009-11-08 21:46:50 -07: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
Chad Kieffer
1265882d6c
Add a note about how unconfirmed user registrations can be removed.
2009-11-07 13:36:52 -07:00
Chad Kieffer
8ab32fe3d5
HTML markup updates, removed CSS after recent updates, a few label headings edits.
2009-11-07 00:12:45 -07:00
Tim Almdal
b763c82ae5
Display the register link in the user_menu instead of the site_menu. Ticket #871
2009-11-06 14:12:56 -08:00
Tim Almdal
25bfc090ba
Change the tag cloud so its updated when a new tag is added.
2009-11-06 08:45:02 -08:00
Tim Almdal
f57ac32e23
Always show the update button, even if there is no default group. Also don't set the default group for the user if there has been no default user defined.
2009-11-03 19:19:24 -08:00
Tim Almdal
4eaa434886
Latest re-incarnation of the user registration module.
...
This change implements all the modes:
* Visitors cannot create users
* Visitors can create an account without confirmation nor admin approval
* Visitors can create an account with conformation and admin approval
* Visitors can create an account with confirmation and no admin approval
2009-11-03 14:45:52 -08:00
Tim Almdal
317e2b1964
Merge branch 'master' of git@github.com:gallery/gallery3-contrib into talmdal
2009-11-02 06:53:23 -08:00
Bharat Mediratta
59d74c5896
Merge branch 'master' of git@github.com:gallery/gallery3-contrib
2009-11-01 10:12:54 -08:00
Bharat Mediratta
75a42e6e3f
Unnecessary file.
2009-11-01 10:12:08 -08:00
Tim Almdal
1779518e73
Add a full_name to the ldap provider
2009-11-01 10:05:22 -08:00
Tim Almdal
60f26d711f
Merge branch 'master' of git@github.com:gallery/gallery3-contrib into talmdal
2009-11-01 07:47:15 -08:00
Tim Almdal
3d82eb19f2
delete the unused ldap.php config file and rename the gallery.ldif to gallery_sample.ldif to clearly indicate that it is not required and only a sample.
2009-10-31 14:34:33 -07:00
