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 |
saurabhbhatia
|
7ed2afb405
|
NTU CPH initiated
Conflicts:
config/mongoid.yml
|
2013-11-15 17:36:06 +08:00 |
Spen
|
20e2f07b26
|
add Member frontend page selection options and fix backend role filter page
|
2013-11-15 17:08:45 +08:00 |
Spen
|
c291f15e23
|
add member-role.js
|
2013-11-15 17:00:41 +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 |
saurabhbhatia
|
7028390248
|
Fixed Submenu
|
2013-11-15 14:48:15 +08:00 |
Harry Bomrah
|
8f3a68b3d7
|
completed locations frontend and widget using categories filtering etc.
|
2013-11-14 10:04:19 +08:00 |
saurabhbhatia
|
eeb7f72876
|
Updated Items.js as per ray's specifications
|
2013-11-13 16:40:37 +08:00 |
saurabhbhatia
|
a49562e341
|
Fixed Reloading problem and generate div only if path argument present
|
2013-11-13 15:47:12 +08:00 |
Harry Bomrah
|
a3d921c47a
|
implementd maps with category filteration and custom color markers.
|
2013-11-13 15:44:28 +08:00 |
saurabhbhatia
|
6d5b3a35e9
|
Alternative fix in parser frontend
|
2013-11-13 13:23:12 +08:00 |
saurabhbhatia
|
2e5b3e8ef7
|
Fix for Reloading bug
|
2013-11-13 13:02:20 +08:00 |
saurabhbhatia
|
635f82db2f
|
Updated Approvable to work for submanager role also
|
2013-11-13 10:35:03 +08:00 |
Manson Wang
|
182729a7fe
|
Prevent reloading issue in kernel.js
|
2013-11-13 10:19:40 +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
|
5f3f27fe9a
|
Desktop Enabled in menu
|
2013-11-11 18:31:04 +08:00 |
saurabhbhatia
|
c575dbd33a
|
Fixed Desktop Openness
|
2013-11-11 17:40:51 +08:00 |
Harry Bomrah
|
405c2c5a12
|
small fix for banner pagination.
|
2013-11-11 17:23:18 +08:00 |
saurabhbhatia
|
5e0696890a
|
Updated Remember me, and Homepage widget more link
|
2013-11-11 17:23:03 +08:00 |
Harry Bomrah
|
afff07ec89
|
items.js modified for new page setting
|
2013-11-08 18:32:45 +08:00 |
saurabhbhatia
|
82ce516d7a
|
Fix for more link
|
2013-11-08 18:28:09 +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 |
saurabhbhatia
|
2f61f55be2
|
Rays fixes
|
2013-11-08 12:55:04 +08:00 |
Harry Bomrah
|
0db28d9ab4
|
gallery theater url fix for theater
|
2013-11-07 22:11:40 +08:00 |
saurabhbhatia
|
4f3f074573
|
Fixed page node link
|
2013-11-07 19:46:50 +08:00 |
Harry Bomrah
|
c51dd81d2b
|
fixed page setting select all bug
|
2013-11-07 19:27:04 +08:00 |
Harry Bomrah
|
d17953ab86
|
partial is rendered when editing a page part
|
2013-11-07 17:23:15 +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
|
49217d4705
|
fixed all button for page settings and also filter display after page refresh
|
2013-11-06 22:36:59 +08:00 |
saurabhbhatia
|
591a3e0bc4
|
Updated redirect path after saving a page
|
2013-11-06 17:20:40 +08:00 |
Manson Wang
|
3744e1c3e7
|
By Ray, Fix structure page editinh bug
|
2013-11-06 17:16:14 +08:00 |
Manson Wang
|
5df8ff2e52
|
By Ray, Fix structure page editing bug
|
2013-11-06 16:48:56 +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 |
saurabhbhatia
|
9760100b69
|
Removed the logger
|
2013-11-06 16:38:55 +08:00 |
Manson Wang
|
ff6eb5d674
|
Fix annoucement preview image bug
|
2013-11-06 16:31:27 +08:00 |
saurabhbhatia
|
2d0fd1d2e4
|
Fixed select all checkboxes
|
2013-11-06 15:29:15 +08:00 |
saurabhbhatia
|
ef67941ba5
|
Fix for widgets edit form
|
2013-11-06 15:11:09 +08:00 |
Manson Wang
|
18d0657321
|
Fix dashboard system usage refresh bug
|
2013-11-06 09:29:57 +08:00 |