 Harry Bomrah
|
e4a16eab3a
|
commit for survey questions
|
2013-09-17 15:34:23 +08:00 |
saurabhbhatia
|
cd1d4356fb
|
Updated import data to get complete teacher and announcement data
|
2013-09-17 11:36:50 +08:00 |
|
saurabhbhatia
|
d5357ea63c
|
Updated import controller
|
2013-09-17 11:36:45 +08:00 |
|
saurabhbhatia
|
50bb2a870c
|
Updated Import data with page data importing successfully
|
2013-09-17 11:36:41 +08:00 |
|
saurabhbhatia
|
a93945cd45
|
Updated import data with pages working
|
2013-09-17 11:36:38 +08:00 |
|
saurabhbhatia
|
249644e72c
|
Added method for importing page data
|
2013-09-17 11:36:35 +08:00 |
|
saurabhbhatia
|
f16d1908be
|
Updated import data controller to import data correctly
|
2013-09-17 11:36:31 +08:00 |
|
saurabhbhatia
|
c8be884291
|
Updated import data controller
|
2013-09-17 11:36:29 +08:00 |
|
saurabhbhatia
|
6280fdfba0
|
Updated route to get announcement data
Conflicts:
config/routes.rb
|
2013-09-17 11:36:26 +08:00 |
|
saurabhbhatia
|
2a9948868f
|
Updated import data controller to check the absense of title data
|
2013-09-17 11:36:24 +08:00 |
|
saurabhbhatia
|
e4514a353a
|
Updated import data controller to check for blank user_id
|
2013-09-17 11:36:07 +08:00 |
|
saurabhbhatia
|
d2a07d9ffb
|
Import Announcements, Journal Paper, Conference Data, book data
Conflicts:
app/models/user/user.rb
|
2013-09-17 11:36:05 +08:00 |
|
saurabhbhatia
|
93909eeca0
|
Get data from database
Conflicts:
app/controllers/admin/import_data_controller.rb
Conflicts:
app/controllers/admin/import_data_controller.rb
app/views/admin/import_data/get_teacher_data.html.erb
|
2013-09-17 11:36:02 +08:00 |
|
Harry Bomrah
|
e45b7e09a0
|
half survey module form changed to new ui plus one calendar fix
|
2013-09-16 12:25:58 +08:00 |
|
Harry Bomrah
|
bd3462df7f
|
small change left in last commit. commiting for gallery widget
|
2013-09-16 11:19:24 +08:00 |
|
Harry Bomrah
|
f5f1822f0a
|
no data file added
|
2013-09-16 11:19:18 +08:00 |
|
Harry Bomrah
|
d532ded8e4
|
widget code for gallery rewritten for new_ui
|
2013-09-16 11:19:11 +08:00 |
chris
|
8456a91968
|
Fix structure edit
|
2013-09-14 17:26:16 +08:00 |
|
chris
|
ba7ac5d954
|
Fix [app_name]_category_with_title and change announcement init
|
2013-09-14 11:54:35 +08:00 |
Spen
|
9cc1e95cb1
|
announcement add new widget bulletins_and_links
Conflicts:
vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_bulletins.html.erb
|
2013-09-14 11:52:19 +08:00 |
|
chris
|
c1cbfddf4b
|
Fix for user and role relationship (from role and sub-role side)
|
2013-09-13 17:39:01 +08:00 |
|
Harry Bomrah
|
3595c59810
|
some unmerged code i pushd 3 months back not update by chris
|
2013-09-13 15:58:42 +08:00 |
|
Harry Bomrah
|
789e02e313
|
ad_banner banner load fixed for test site
|
2013-09-13 14:23:44 +08:00 |
Manson Wang
|
bb8bc9a529
|
Added missing translation for gallery
|
2013-09-12 10:10:37 +08:00 |
|
Manson
|
6430e60577
|
Added the missing translations in config/locales/en.yml and zh_tw.yml
Conflicts:
config/locales/en.yml
config/locales/zh_tw.yml
|
2013-09-12 09:30:07 +08:00 |
|
chris
|
17d7912e07
|
Ray's js code for status in form
|
2013-09-11 19:24:58 +08:00 |
|
chris
|
911cfdc980
|
Move js into a file for status in form
|
2013-09-11 18:38:56 +08:00 |
|
Harry Bomrah
|
579bc3c245
|
some very small fix for image alternative text and browse files manager
|
2013-09-11 14:03:25 +08:00 |
|
Harry Bomrah
|
8c98645a69
|
small bug fix for inserting and delete button.
|
2013-09-11 14:03:19 +08:00 |
|
Harry Bomrah
|
9e10a3c944
|
editing for the assets are done with replacable files and description
|
2013-09-11 14:03:13 +08:00 |
|
Harry Bomrah
|
f920a4f6ba
|
filemanager and some update for file uploader . added file uploader to kernel
|
2013-09-11 14:03:06 +08:00 |
|
chris
|
3328a41b55
|
Put back js that was deleted by mistake
|
2013-09-11 14:01:06 +08:00 |
|
chris
|
06203d27b9
|
Fix for user and role relationship
|
2013-09-11 14:00:41 +08:00 |
|
saurabhbhatia
|
865be29b37
|
Updated Preference Page
|
2013-09-09 11:29:46 +08:00 |
|
saurabhbhatia
|
0eeb7db1a8
|
Updated preference UI
|
2013-09-09 11:02:58 +08:00 |
|
saurabhbhatia
|
7216676c40
|
Updated Sidebar and Preferences
|
2013-09-09 10:18:14 +08:00 |
|
saurabhbhatia
|
fa857cfeea
|
Default Locale
|
2013-09-06 18:00:36 +08:00 |
|
saurabhbhatia
|
a3f1b8d54a
|
Updated Preferences in Site Info
|
2013-09-06 18:00:30 +08:00 |
|
saurabhbhatia
|
e9d6fa8787
|
Preference Page
|
2013-09-06 18:00:28 +08:00 |
|
saurabhbhatia
|
6e032a8757
|
Add Preference and search engine
|
2013-09-06 18:00:23 +08:00 |
|
saurabhbhatia
|
1558cfdb4e
|
Updated Sitebar with Search Engine
|
2013-09-06 18:00:21 +08:00 |
|
saurabhbhatia
|
9e4686a565
|
Fixed Site Info completely and added search engine page
|
2013-09-06 18:00:18 +08:00 |
|
saurabhbhatia
|
fef7cc4ed2
|
Updated Site info
|
2013-09-06 18:00:10 +08:00 |
|
saurabhbhatia
|
7f0821ea84
|
Updated Site info page to new ui
|
2013-09-06 17:59:56 +08:00 |
|
saurabhbhatia
|
2c0761aafb
|
Updated Sitemap to New UI
|
2013-09-06 17:59:54 +08:00 |
|
saurabhbhatia
|
1e5ad750cd
|
Updated Site bar with correct links
|
2013-09-06 17:59:43 +08:00 |
|
Harry Bomrah
|
335991e152
|
by mistake pushed code with debugger
|
2013-09-05 12:51:15 +08:00 |
|
Harry Bomrah
|
131dd3fea8
|
child images tag adding and deleting updated.
|
2013-09-05 12:51:13 +08:00 |
|
chris
|
6d8698af63
|
Comment out included css from member front
|
2013-09-03 17:09:47 +08:00 |
Matt K. Fu
|
00ddd94314
|
fix design index
|
2013-09-03 15:20:48 +08:00 |