Harry Bomrah
8b44f930f3
widget and gridster fixes
2013-04-01 18:00:47 +08:00
Harry Bomrah
6c58a0f773
compatibility page added and tinyscrollbar drag event fixed..
2013-03-21 18:25:33 +08:00
12fdb5a0ca
have done conference author filter, journal haven't been done, yet
2013-03-21 18:24:16 +08:00
43f7711433
Put back Gemfile.lock
2013-03-20 00:30:58 +08:00
b92f6d2274
Update Gemfile.lock
2013-03-19 23:59:40 +08:00
6abf53f34d
change page number of archive
2013-03-19 23:43:28 +08:00
Harry Bomrah
c1cb5e5ffb
tinyscrollbar_bug fixed
2013-03-01 17:49:58 +08:00
522e0481e1
add conferene list order function
2013-02-25 12:01:59 +08:00
Harry Bomrah
9f362d9ae6
gridster, url code fixed, views removed.
2013-02-25 11:08:56 +08:00
4709c08ad1
Temporary fix zh_tw.yml
...
New Gemfile.lock
2013-02-21 14:43:49 +08:00
13c757e8a9
clean add/edit page and add conference list page
2013-02-21 13:58:30 +08:00
e604c38eb4
Push Gemfile.lock
2013-02-19 17:24:24 +08:00
c21e204697
again minor shit update
2012-09-13 23:58:32 +08:00
29ea95b4c6
event_calendar testing
2012-09-13 23:57:47 +08:00
45ef7fd302
guest user
2012-09-12 16:20:15 +08:00
7d5531bf01
Merge branch 'nccu_master' into demo_site
...
Conflicts:
Gemfile
app/assets/javascripts/tinymce_orbit.js.erb
app/assets/stylesheets/style.css.erb
app/controllers/admin/assets_controller.rb
app/controllers/admin/module_apps_new_interface_controller.rb
app/controllers/admin/page_parts_controller.rb
app/jobs/sync_db.rb
app/models/page.rb
app/models/page_part.rb
app/models/user/user.rb
app/uploaders/image_uploader.rb
app/views/admin/assets/create.js.erb
app/views/admin/module_apps/reload_frontend_pages.js.erb
app/views/layouts/_orbit_bar.html.erb
app/views/layouts/_side_bar.html.erb
app/views/layouts/_users_checkbox_ary.html.erb
app/views/shared/_privilege_user.html.erb
config/mongoid.yml
lib/parsers/parser_common.rb
vendor/built_in_modules/announcement/announcement.json
vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
2012-08-22 18:07:49 +08:00
987e6fff2b
1.Rss feed but no entry for clicking now. wait for design.
...
2.Unit link is now fixed.
2012-08-09 02:20:10 +08:00
e8317e0a4b
1.Remove category column when category is specified
...
2.Showing category if not in category browsing
3.Redirect to home and show error if app page is not available for user language
4.Showing no context to display if object has no language for it.
5.Browse new and announcement by unit is now applicable.
2012-08-08 14:46:08 +08:00
85a556a4a2
first version of fb_share
2012-08-08 11:04:19 +08:00
1cdc0e24bd
First version of Solr search.
2012-08-08 10:59:55 +08:00
cd6d95204f
Move Impressionist to Gemfile
2012-07-27 19:14:25 +08:00
de831f1f96
disable homepage cache for english page
2012-07-27 05:08:24 +08:00
f9bdb4a327
New and Announcement search. Disabled impression.
2012-07-20 15:47:40 +08:00
4daf36908c
working cache
2012-07-13 15:36:10 +08:00
85d6bbe1c9
add i18n variable. fix web_links for disable category
2012-07-11 17:56:31 +08:00
830eb8eb62
Timeline design and timescale update
2012-07-06 16:11:03 +08:00
f635f642fc
Merge for new timeline updates and font updates
2012-07-04 18:49:10 +08:00
3f42a22094
Books section added
2012-07-04 17:55:30 +08:00
f20f36383e
Timeline ajax load fixed… a bit change in structure..
2012-07-03 19:45:47 +08:00
a1e74987dc
Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry
...
Conflicts:
Gemfile.lock
app/assets/javascripts/.DS_Store
app/assets/stylesheets/style.css.erb
app/views/layouts/_orbit_bar.html.erb
2012-06-29 16:10:29 +08:00
555ec86403
Timeline commit
2012-06-26 15:59:28 +08:00
3f95fe4f13
tmp commit for search. start nccu0621 first
2012-06-22 11:34:10 +08:00
cb17fe0825
Search sold edition,rake sunspot:solr:run. NewsBulletin.solr_search,NewsBulletin.solr_reindex. Not working
2012-06-20 14:50:51 +08:00
7f0267aedd
have both sinatra and rails running.. just change the routes to use rails or sinatra.. tried using a lot of gems but failed to use devise variables
2012-06-04 18:00:06 +08:00
8dd1ab32c1
Add this toolbar, and nccu calendar fix
2012-06-04 16:51:29 +08:00
2f500ff460
For non-login user,show no drop down menu and return to home after press orbit button.
2012-05-29 16:33:38 +08:00
f950f77f36
Merge branch 'design_team' into ldap
...
Conflicts:
Gemfile
app/models/ad_banner.rb
2012-05-15 23:02:22 +08:00
e54f4409fb
Add impressionist
2012-05-15 21:26:09 +08:00
ebc8dd33ec
Merge branch 'design_team' into ldap
...
Conflicts:
Gemfile.lock
app/controllers/admin/module_apps_controller.rb
app/controllers/application_controller.rb
vendor/built_in_modules/web_resource/web_resource.json
2012-05-14 00:57:17 +08:00
6a443f0976
Add mongoid-tree to Item
2012-05-11 16:16:09 +08:00
fd52d00187
Add drag and drop to structure side_bar
2012-05-11 10:00:45 +08:00
7af17f19ac
God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync.
2012-05-08 20:26:36 +08:00
f3b58ea36d
starting Resque
2012-05-08 20:24:37 +08:00
f949523bbb
God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync.
2012-05-08 20:21:28 +08:00
c28d7d59b6
starting Resque
2012-05-08 20:21:28 +08:00
f827e8429e
Calendar sync done,need Ray's JS change
2012-05-08 16:08:41 +08:00
65a0998080
Merge branch 'jobs_and_mail' into ldap
...
Conflicts:
config/environments/development.rb
config/routes.rb
2012-05-08 11:45:34 +08:00
d7194dc805
God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync.
2012-05-08 11:41:58 +08:00
7339d1ee4a
starting Resque
2012-05-08 11:41:58 +08:00
aacd9da9fb
auto login encryption done…
2012-04-30 14:29:42 +08:00
Harry Bomrah
Rueshyna
chris
Harry Bomrah
Matthew K. Fu JuYuan
Joshua Milton