saurabhbhatia
|
63a8f24f49
|
both manual and automatic methods working
Conflicts:
config/routes.rb
|
2014-01-13 15:50:43 +08:00 |
|
saurabhbhatia
|
e9d2051d78
|
Added Automatic Synchronize
Conflicts:
Gemfile
app/controllers/admin/import_data_controller.rb
vendor/built_in_modules/personal_conference/app/models/writing_conference.rb
|
2014-01-13 15:50:43 +08:00 |
 Harry Bomrah
|
1a90990311
|
template_store and some changes for the store..
|
2014-01-06 14:56:04 +08:00 |
|
saurabhbhatia
|
a4c826dd48
|
Fixed module store
|
2013-12-24 15:58:13 +08:00 |
|
saurabhbhatia
|
fd24fbe082
|
Commit for Basic Site
|
2013-12-16 16:08:12 +08:00 |
|
saurabhbhatia
|
dccb9c75d8
|
Page Parts now working
|
2013-12-13 18:40:15 +08:00 |
Bernie Chiu
|
eb638995f0
|
Fix missing params category value
|
2013-12-13 16:19:19 +08:00 |
Manson Wang
|
e9a40774ac
|
Add phone numbers to mobile front_end
|
2013-12-12 17:59:56 +08:00 |
|
Manson Wang
|
afb5afeceb
|
Added multi-phone numbers in mobile setting page and fixed language setting
|
2013-12-12 16:07:27 +08:00 |
|
Harry Bomrah
|
0671d0b126
|
filemanger authentication changes and also announcement preview fixed and also text search for files
Conflicts:
app/views/admin/assets/index.html.erb
|
2013-12-11 18:49:54 +08:00 |
|
Harry Bomrah
|
a02cd97880
|
file manger preview and pagination is done.
|
2013-12-11 14:41:08 +08:00 |
|
Harry Bomrah
|
800f108be3
|
added enabling and disabling feature of widget count in module init
|
2013-12-10 17:43:31 +08:00 |
|
Harry Bomrah
|
51f170589f
|
now we can set two colors gradient for orbit bar
|
2013-12-10 09:58:58 +08:00 |
|
Harry Bomrah
|
d8cf721a5b
|
rescue added for the previous feature
|
2013-12-05 17:30:41 +08:00 |
|
Harry Bomrah
|
9db4c787c9
|
approve and delete all done with registration approval notification for admin
|
2013-12-05 17:30:33 +08:00 |
|
saurabhbhatia
|
53a51cc796
|
Removed unnecessary code
|
2013-12-04 17:13:02 +08:00 |
|
saurabhbhatia
|
7f4d4ae93f
|
Announcement Categories in Mobile settings
|
2013-12-04 17:12:25 +08:00 |
|
saurabhbhatia
|
2b4fa96b74
|
No email for user if added by admin
|
2013-12-04 14:38:22 +08:00 |
|
Manson Wang
|
4b169cf2e0
|
Fix desktop nil theme bug and approval for new user
|
2013-12-04 13:43:00 +08:00 |
|
saurabhbhatia
|
9f3042c4fe
|
Fix for mailer
|
2013-12-04 11:42:39 +08:00 |
|
saurabhbhatia
|
e87c678eb7
|
Channel Videos Mobile Sites Partial
|
2013-12-03 15:50:27 +08:00 |
|
saurabhbhatia
|
888f41a959
|
Added condition for default locale present
|
2013-12-02 14:30:12 +08:00 |
|
saurabhbhatia
|
d0d6a4147e
|
Fixed Default Locale
|
2013-12-02 13:24:41 +08:00 |
|
saurabhbhatia
|
18a1701472
|
Fixed Default Locale
|
2013-11-29 21:37:25 +08:00 |
|
Harry Bomrah
|
f1c2e29bf1
|
form validations and ajax check plus user approval done
|
2013-11-29 16:40:46 +08:00 |
|
saurabhbhatia
|
f509e74938
|
Rescue nil in Albums
|
2013-11-28 16:22:03 +08:00 |
|
saurabhbhatia
|
6d5dd4a80f
|
Changed Site Valid Locales to In Use Locales
|
2013-11-27 17:51:48 +08:00 |
|
saurabhbhatia
|
dead52d8ab
|
Changes in Registration Process
|
2013-11-25 17:05:36 +08:00 |
|
saurabhbhatia
|
03957f565b
|
Added Mobile Web as a separate page
|
2013-11-25 12:43:23 +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
|
ed569601c3
|
two major fix for site setting and bulletin controller
|
2013-11-08 16:38:17 +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
|
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 |
|
saurabhbhatia
|
9760100b69
|
Removed the logger
|
2013-11-06 16:38:55 +08:00 |
|
saurabhbhatia
|
ef67941ba5
|
Fix for widgets edit form
|
2013-11-06 15:11:09 +08:00 |
|
Harry Bomrah
|
3c4f22234b
|
fixed template updation from site preferences
|
2013-11-05 20:50:05 +08:00 |
rulingcom
|
b1867dd47a
|
new code logic for saving tree.. should work fine even if the node positions fail
|
2013-11-04 22:20:50 +08:00 |
chris
|
00010867a4
|
Fix link in structure
|
2013-10-30 18:53:23 +08:00 |
|
Manson Wang
|
a885313e75
|
Dashboard with HighChart
|
2013-10-30 18:23:46 +08:00 |
|
saurabhbhatia
|
3aac221c4e
|
removed site restart after site preferences update
|
2013-10-30 14:18:03 +08:00 |
|
chris
|
36ddbf68e0
|
Fix menu_enabled_for
|
2013-10-29 14:39:23 +08:00 |
|
chris
|
6bc00ce3a3
|
Use module_app label instead of title
|
2013-10-29 11:17:02 +08:00 |
|
chris
|
a14d69211b
|
PagePart widgets for "system widget"
Delete useless code
|
2013-10-28 16:29:23 +08:00 |
|
chris
|
218cb03641
|
PagePart widgets except "system widget"
|
2013-10-28 16:29:23 +08:00 |