manson666
|
3375a41106
|
Fix sync auto
|
2014-01-23 11:59:59 +08:00 |
Manson Wang
|
ed8b42e948
|
Import teacher data
|
2014-01-23 11:59:59 +08:00 |
Spen
|
198c302891
|
ntu coph sso
|
2014-01-23 11:59:59 +08:00 |
|
Spen
|
e4aea37b00
|
ntu coph member plugin data sync
|
2014-01-23 11:59:58 +08:00 |
 Harry Bomrah
|
2ef59530a5
|
sync button added for desktop and also fixed a little bug..
|
2014-01-23 11:59:58 +08:00 |
|
Manson Wang
|
6ce6852c9d
|
Desktop sync button.. not finished
|
2014-01-23 11:59:58 +08:00 |
|
Harry Bomrah
|
5de7fcfaf6
|
added sync for journal paper books and conference.. and also disabled the icons
Conflicts:
app/assets/javascripts/desktop/orbitdesktop.js
app/controllers/admin/import_data_controller.rb
Conflicts:
vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/desktop/personal_books_controller.rb
vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/index.html.erb
vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/conference_pages.js
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb
vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js
vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb
|
2014-01-23 11:59:58 +08:00 |
|
Manson Wang
|
668c1e7d75
|
Added sync button in personal plugin back_end
Conflicts:
config/locales/en.yml
config/locales/zh_tw.yml
vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/_profile.html.erb
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/plugin/_profile.html.erb
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/plugin/_profile.html.erb
|
2014-01-23 11:59:58 +08:00 |
saurabhbhatia
|
56ad1ddd91
|
Updated Import data without page method
|
2014-01-23 11:59:58 +08:00 |
|
saurabhbhatia
|
c3ece3b7af
|
both manual and automatic methods working
Conflicts:
config/routes.rb
|
2014-01-23 11:59:58 +08:00 |
|
saurabhbhatia
|
3b73fab8e2
|
Added Automatic Synchronize
Conflicts:
Gemfile
app/controllers/admin/import_data_controller.rb
vendor/built_in_modules/personal_conference/app/models/writing_conference.rb
Conflicts:
Gemfile
app/controllers/admin/import_data_controller.rb
|
2014-01-23 11:59:58 +08:00 |
|
saurabhbhatia
|
5fee058006
|
Import Data, Sync Data
Conflicts:
config/mongoid.yml
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
|
2014-01-23 11:59:58 +08:00 |
Bernie Chiu
|
d19223c873
|
Fix duplicate options
|
2014-01-22 10:35:56 +08:00 |
|
Spen
|
77c00ac72f
|
fix new ui member-pic default size 200 * 200
|
2014-01-22 10:35:21 +08:00 |
|
Manson Wang
|
92f1f44e4b
|
Fix sitemap toggle
|
2014-01-17 18:15:37 +08:00 |
|
Manson Wang
|
332658d394
|
Fix translations and side_bar order
|
2014-01-16 10:45:58 +08:00 |
|
Manson Wang
|
e947af4c34
|
Removed banner_nav.css and default_widget.css in application_helper.rb
|
2014-01-14 16:19:50 +08:00 |
|
Saurabh Bhatia
|
37e58cd780
|
Added function to see if the module is installed or not
|
2014-01-14 12:29:17 +08:00 |
|
Saurabh Bhatia
|
2931676ecf
|
Reverted back Locations Module
|
2014-01-14 11:39:20 +08:00 |
|
Spen
|
e71a343718
|
fix new ui page get_item search and back_end_helper can add args option
|
2014-01-14 11:26:16 +08:00 |
|
Saurabh Bhatia
|
a108426412
|
Updated Module Store to Install a Module directly from Store.tp
|
2014-01-14 11:20:30 +08:00 |
|
Manson Wang
|
a154d16a7e
|
Update Manager
|
2014-01-13 18:07:07 +08:00 |
|
Manson Wang
|
bba0e436d9
|
Fix missing CSS and removed useless bad gems that cause error
|
2014-01-13 15:43:51 +08:00 |
|
Spen
|
304bf0d445
|
fix new ui announcement widget_style "bulletins_and_web_links"
|
2014-01-13 10:49:59 +08:00 |
|
Saurabh Bhatia
|
a85de4ae00
|
Updated Readme
|
2014-01-13 09:40:12 +08:00 |
|
Harry Bomrah
|
07cc9cc4b1
|
calendar frontend js fixed and also agenda view minor fix
|
2014-01-08 18:26:57 +08:00 |
rulingcom
|
3fbbbbc3eb
|
UI Changes for Calendar - Ray's Changes
|
2014-01-08 17:52:16 +08:00 |
|
saurabhbhatia
|
b82565fa92
|
Removed Unnecessary add button
|
2014-01-08 12:47:44 +08:00 |
|
Spen
|
eb9038965a
|
fix new ui web_link frontend
|
2014-01-08 12:34:17 +08:00 |
|
saurabhbhatia
|
aaf7f7362c
|
Fix for submenu automation
|
2014-01-07 17:56:58 +08:00 |
|
Spen
|
3cd3a8bd73
|
old ui gallery change to new ui need to run
rake gallery_album:gallery_album_to_new
|
2014-01-07 15:53:27 +08:00 |
|
saurabhbhatia
|
3938f7df06
|
Updated Items
|
2014-01-07 15:51:07 +08:00 |
|
Harry Bomrah
|
1a90990311
|
template_store and some changes for the store..
|
2014-01-06 14:56:04 +08:00 |
|
Bernie Chiu
|
db86d5248f
|
Refactor the title locale display
|
2014-01-03 17:56:11 +08:00 |
|
Bernie Chiu
|
291a16585b
|
Fix wrong displayed field in current locale
Conflicts:
vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_questions.html.erb
|
2014-01-03 17:56:03 +08:00 |
|
Bernie Chiu
|
14b742b022
|
Fix added option field to sync with primary locale
|
2014-01-03 17:42:13 +08:00 |
|
saurabhbhatia
|
c62b8d4d37
|
Disable confirmation email for guest user
|
2014-01-03 17:35:56 +08:00 |
|
Spen
|
e4cc6d543b
|
new ui add setting to show in the member frontend
|
2014-01-03 16:35:52 +08:00 |
|
saurabhbhatia
|
ca8c895ac8
|
Removed update taggable ids method
|
2014-01-03 16:02:56 +08:00 |
|
saurabhbhatia
|
ec2fe965d0
|
Removed callback that was not required anymore
|
2014-01-03 14:54:23 +08:00 |
|
saurabhbhatia
|
f3e3d702a4
|
Fix for Tags
|
2014-01-03 14:53:13 +08:00 |
|
saurabhbhatia
|
d90351b82c
|
Changed production settings for sendgrid
|
2014-01-03 09:44:46 +08:00 |
|
saurabhbhatia
|
9643de5d56
|
Fixed Forgot password
|
2014-01-02 17:53:05 +08:00 |
|
saurabhbhatia
|
684f2c75be
|
Fix for tags
|
2013-12-31 12:01:11 +08:00 |
|
saurabhbhatia
|
caef586691
|
Fixed Update tagging issue in announcement
|
2013-12-30 18:07:52 +08:00 |
thomaschen
|
6a6640b84c
|
fix chinese translation
|
2013-12-27 18:10:44 +08:00 |
|
thomaschen
|
bb25da5dad
|
fix missing header in survey
|
2013-12-27 18:10:38 +08:00 |
|
Bernie Chiu
|
40df7d3531
|
Fix to proper translations
|
2013-12-27 18:10:12 +08:00 |
|
saurabhbhatia
|
b5c1bfa27e
|
Corrected Breadcrumb
|
2013-12-27 15:37:24 +08:00 |
|
Bernie Chiu
|
936a4e148c
|
Fix conflict YML naming
|
2013-12-27 11:20:00 +08:00 |