saurabhbhatia
|
f8ad13a9f5
|
Import Data, Sync Data
Conflicts:
vendor/built_in_modules/personal_book/app/models/writing_book.rb
vendor/built_in_modules/personal_conference/app/models/writing_conference.rb
vendor/built_in_modules/personal_journal/app/models/writing_journal.rb
|
2013-11-15 17:36:35 +08:00 |
Spen
|
20e2f07b26
|
add Member frontend page selection options and fix backend role filter page
|
2013-11-15 17:08:45 +08:00 |
|
saurabhbhatia
|
ce8e9c0a5f
|
Revert "more button fix and also new way to select more page."
This reverts commit e129b25554.
|
2013-11-15 16:58:27 +08:00 |
|
saurabhbhatia
|
dc5ef21516
|
Revert "add Member frontend page selection options and fix backend role filter page"
This reverts commit ea3f9c8163.
|
2013-11-15 16:58:11 +08:00 |
|
Spen
|
ea3f9c8163
|
add Member frontend page selection options and fix backend role filter page
|
2013-11-15 16:16:39 +08:00 |
 Harry Bomrah
|
e129b25554
|
more button fix and also new way to select more page.
|
2013-11-15 15:13:58 +08:00 |
|
Harry Bomrah
|
8f3a68b3d7
|
completed locations frontend and widget using categories filtering etc.
|
2013-11-14 10:04:19 +08:00 |
|
Harry Bomrah
|
a3d921c47a
|
implementd maps with category filteration and custom color markers.
|
2013-11-13 15:44:28 +08:00 |
Manson Wang
|
a1840c86de
|
Fix Peg_content,Annoucement authorization bug
|
2013-11-12 19:09:29 +08:00 |
|
Harry Bomrah
|
3d091b692d
|
category blank fix
|
2013-11-12 17:35:41 +08:00 |
|
Harry Bomrah
|
f91c08ce4b
|
color added to location categories.
|
2013-11-12 16:45:42 +08:00 |
rulingcom
|
528f7d28b9
|
theaterurk fix
|
2013-11-12 12:20:36 +08:00 |
|
saurabhbhatia
|
5e0696890a
|
Updated Remember me, and Homepage widget more link
|
2013-11-11 17:23:03 +08:00 |
|
Spen
|
989002a5ae
|
fix new ui faq frontend
|
2013-11-08 17:42:00 +08:00 |
|
rulingcom
|
72a37afddb
|
announcment fixed for frontend
|
2013-11-08 17:37:55 +08:00 |
|
Harry Bomrah
|
ed569601c3
|
two major fix for site setting and bulletin controller
|
2013-11-08 16:38:17 +08:00 |
|
Harry Bomrah
|
9e432a5a93
|
fixed announcement rendering..
|
2013-11-08 12:58:34 +08:00 |
|
Harry Bomrah
|
0db28d9ab4
|
gallery theater url fix for theater
|
2013-11-07 22:11:40 +08:00 |
|
Harry Bomrah
|
4353b481c7
|
changed the frontend loading to more rails specific. and also fixed the filter reload in thumbnali and summary view of members
|
2013-11-07 14:39:07 +08:00 |
|
saurabhbhatia
|
4e706fab0c
|
Fixed gallery and video widgets
|
2013-11-07 11:00:10 +08:00 |
|
Harry Bomrah
|
8c532e7241
|
fixed gallery frontend for category display
|
2013-11-07 09:34:52 +08:00 |
|
Harry Bomrah
|
f191029279
|
design change in album view
|
2013-11-06 16:39:21 +08:00 |
|
Harry Bomrah
|
c158108576
|
gallery all bugs fixed..
|
2013-11-06 16:39:18 +08:00 |
|
Harry Bomrah
|
af103fa427
|
gallery frontend ui fixed.
|
2013-11-05 13:28:10 +08:00 |
|
Spen
|
ced7a59555
|
fix new ui archive and link frontend
|
2013-11-05 11:27:35 +08:00 |
|
saurabhbhatia
|
54f778f17d
|
Updated Calendar frontend
|
2013-11-04 23:03:28 +08:00 |
|
Harry Bomrah
|
3db075b9d2
|
side bar for calendar fixed.
|
2013-11-04 18:31:10 +08:00 |
|
Harry Bomrah
|
eaa87b3dd8
|
new categories for calendar with colors inside.. plus changed the working of calendar. it has now categories like all other modules
|
2013-11-04 15:17:50 +08:00 |
|
Manson Wang
|
a885313e75
|
Dashboard with HighChart
|
2013-10-30 18:23:46 +08:00 |
|
Spen
|
9746ae4676
|
fix new ui announcement init data count
|
2013-10-29 14:45:29 +08:00 |
|
Spen
|
254f926093
|
fix new ui announcement preview
|
2013-10-24 15:03:20 +08:00 |
|
Spen
|
ace582be0c
|
fix new ui survey module authorization
|
2013-10-21 16:52:32 +08:00 |
chris
|
fea86ba3a9
|
Page slide does not reload from server for ad_banner
|
2013-10-19 19:17:24 +08:00 |
|
chris
|
92d2af13f2
|
changes for ad_banner
|
2013-10-19 19:17:04 +08:00 |
|
chris
|
19bf2f2be5
|
Modify "can_display" to add "postdate" and "deadline"
|
2013-10-19 19:14:37 +08:00 |
|
saurabhbhatia
|
e453efeb6b
|
Revert "add ntu_ga survey init sorting"
This reverts commit 9076d5496a.
|
2013-10-18 19:51:16 +08:00 |
|
Spen
|
9076d5496a
|
add ntu_ga survey init sorting
|
2013-10-18 19:10:22 +08:00 |
|
Spen
|
fbe6017382
|
new ui ask module lose 2 file
|
2013-10-16 10:31:16 +08:00 |
|
chris
|
279ac774d4
|
Migrate form old ui to new ui (categories, tags and authorizations)
|
2013-10-15 23:38:44 +08:00 |
|
Manson Wang
|
76ba7087b2
|
Fix Ad_Banner frontend for IE8
Fix backend bug in editing banner
Translation Added
|
2013-10-15 19:37:12 +08:00 |
|
Spen
|
b9fbba2962
|
fix new ui ask module frontend
|
2013-10-15 17:01:07 +08:00 |
|
Harry Bomrah
|
14ea611f8c
|
fixed file view on server for desktop
|
2013-10-14 16:49:54 +08:00 |
|
Harry Bomrah
|
4f04eca74f
|
test for fileview in desktop on server
|
2013-10-14 16:49:51 +08:00 |
|
saurabhbhatia
|
7ef2dacf00
|
Fix links in member module
|
2013-10-09 05:22:51 +00:00 |
|
Spen
|
f85354c2b6
|
fix new ui link and archive frontend and widget index
|
2013-10-04 11:51:36 +08:00 |
|
Harry Bomrah
|
caca264b50
|
isotope fixed for all plugins for list and form.
|
2013-10-01 15:06:49 +08:00 |
|
saurabhbhatia
|
9a0e9ddc82
|
Revert "Updated Bulletins controller with announcement approval fix"
This reverts commit a9431ad17e.
|
2013-10-01 15:03:34 +08:00 |
|
saurabhbhatia
|
9f490c87d2
|
Fixed issue with member plugin delete label
|
2013-10-01 10:43:37 +08:00 |
|
saurabhbhatia
|
a9431ad17e
|
Updated Bulletins controller with announcement approval fix
|
2013-10-01 10:03:18 +08:00 |
|
saurabhbhatia
|
d9ac24470f
|
Updated Member plugin names to remove spaces and generate correct links
|
2013-09-30 18:25:18 +08:00 |