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
|
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
|
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 |
|
saurabhbhatia
|
fa857cfeea
|
Default Locale
|
2013-09-06 18:00:36 +08:00 |
|
saurabhbhatia
|
6e032a8757
|
Add Preference and search engine
|
2013-09-06 18:00:23 +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 |
Spen
|
3123c5de0a
|
new ui member bug and interface fix
|
2013-09-02 11:22:17 +08:00 |
|
saurabhbhatia
|
b970ea1e0e
|
Updated Authorization for member, link, tag, archive
|
2013-08-27 10:14:39 +08:00 |
chris
|
45e987d6f5
|
Fix for authorization
Dashboard and page authorisation
|
2013-08-23 12:08:33 +08:00 |
|
saurabhbhatia
|
53e5c57970
|
Commented Dashboard Public Visibility and fall back on no-filter defined authorization
|
2013-08-22 16:43:11 +08:00 |
|
saurabhbhatia
|
4c217ec12f
|
Updated Authorizations for Adbanner, Calendar, Location
|
2013-08-22 15:20:50 +08:00 |
|
saurabhbhatia
|
452da1b8ec
|
Updated Desktop Themes controller
|
2013-08-22 14:14:19 +08:00 |
|
chris
|
c474fa063f
|
New authorization
|
2013-08-21 13:42:29 +08:00 |
|
Spen
|
6c514770bc
|
solved conflict for member_new_ui
|
2013-08-12 15:40:34 +08:00 |
|
saurabhbhatia
|
7c64e8c637
|
Updated AdBanner index page and Ad Image index page, and edit pages
Conflicts:
vendor/built_in_modules/ad_banner/config/locales/en.yml
vendor/built_in_modules/ad_banner/init.rb
|
2013-08-09 15:22:06 +08:00 |
|
saurabhbhatia
|
a2e9aa2e0b
|
Updated ADBanner with fixes on index page, ADImage with fixes
Conflicts:
app/views/admin/ad_banners/index.html.erb
app/views/admin/ad_images/_form.html.erb
vendor/built_in_modules/ad_banner/init.rb
|
2013-08-09 15:21:51 +08:00 |
|
Harry Bomrah
|
c2f223b82c
|
new plugins added for desktop
|
2013-08-06 17:52:39 +08:00 |
|
Harry Bomrah
|
42615f02ea
|
new feature in desktop for uploading wallpapers or putting url link
|
2013-08-02 19:32:41 +08:00 |
|
saurabhbhatia
|
e12b14311e
|
Updated Desktop with new UI
|
2013-07-30 16:43:41 +08:00 |
|
Harry Bomrah
|
f7dbbf1bca
|
new themes added to desktop plus theme uploader created
|
2013-07-30 16:43:32 +08:00 |
|
Harry Bomrah
|
6d89eab98a
|
desktop final fix
|
2013-07-30 16:43:28 +08:00 |
|
Harry Bomrah
|
38194311ab
|
some changes again
|
2013-07-30 16:43:18 +08:00 |
|
Harry Bomrah
|
5f9190db39
|
few updates with fb integration and some other changes in user and supports data to android
Conflicts:
vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb
|
2013-07-30 16:43:11 +08:00 |
|
Harry Bomrah
|
ed22a4d303
|
apps update -- app upload and activation
|
2013-07-30 16:42:50 +08:00 |
devin chen
|
f2ada14b7a
|
app manager's view update
|
2013-07-30 16:42:46 +08:00 |
|
Harry Bomrah
|
2d616ab7a8
|
solved desktop conflict during cherry pick
|
2013-07-30 16:42:26 +08:00 |
|
Harry Bomrah
|
dc94283af9
|
duplicate error fixed and css inside widgets fixed, duplicate location fixed
|
2013-07-30 16:41:38 +08:00 |
|
chris
|
74b2bbf4b7
|
Fix link in structure when the item is a link
Add internal links creation
|
2013-07-30 11:49:28 +08:00 |
|
chris
|
af98f8efce
|
Fix orbit bar language change
|
2013-07-29 19:49:07 +08:00 |
|
chris
|
ff59feb2e7
|
Fix for structure
|
2013-07-29 18:46:38 +08:00 |
|
chris
|
d190a50046
|
Breadcrumb for dashboard (tags and categories cannot link to original module index)
|
2013-07-29 17:34:03 +08:00 |
|
chris
|
da1d70efcb
|
Change authorization to accept other than category
|
2013-07-25 17:36:55 +08:00 |
|
chris
|
1ba1703e90
|
Fix get_viewable
|
2013-07-22 17:41:52 +08:00 |
|
chris
|
1db324d1a2
|
Fix get_sorted_and_filtered
|
2013-07-19 17:38:43 +08:00 |
|
chris
|
5190c1160a
|
Fix get_sorted_and_filtered, accepts 3 arguments and works for category
|
2013-07-16 14:43:56 +08:00 |
|
chris
|
62288a71ca
|
Fix category_id in forms
Fix statuses list
|
2013-07-16 11:41:22 +08:00 |
|
chris
|
1c4b66f1cb
|
Fix approval in index
|
2013-07-10 16:42:25 +08:00 |
|
chris
|
2c331bf1a5
|
Revert non rulingcom email constraint
|
2013-07-04 14:20:13 +08:00 |
|
chris
|
856898016b
|
New UI changes(tags, categories, authorisations, module index…)
To run:
- ruby lib/remove_old_tags.rb DB_NAME
- rake new_ui:migrate_tags
- rake new_ui:migrate_categories['APP_KEY,''MODEL_NAME'] (check new_ui.rake for more details)
|
2013-07-02 16:46:44 +08:00 |