Matthew K. Fu JuYuan
|
42cfe5ac91
|
first version for new member html
|
2012-09-11 10:52:27 +08:00 |
chris
|
dcdd730a01
|
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
Conflicts:
app/assets/javascripts/bulletin_form.js.erb
app/views/layouts/_side_bar.html.erb
vendor/built_in_modules/archive/app/models/archive_file.rb
vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb
vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb
|
2012-08-31 14:31:54 +08:00 |
unknown
|
0cb573946e
|
update item page
|
2012-08-30 15:17:39 +08:00 |
unknown
|
a1560ebcf5
|
update archive
|
2012-08-30 15:17:39 +08:00 |
Christophe Vilayphiou
|
3ebe7378b9
|
Delete duplicate side_bar code
|
2012-08-30 14:49:31 +08:00 |
unknown
|
bc5235aa9f
|
archive checkbox
|
2012-08-30 14:49:31 +08:00 |
unknown
|
e281262b6d
|
new archive
|
2012-08-30 14:49:31 +08:00 |
unknown
|
2a4c737cdd
|
archive checkbox
|
2012-08-30 14:48:42 +08:00 |
unknown
|
7ce4a51b73
|
new archive
|
2012-08-30 14:45:28 +08:00 |
unknown
|
eb7e73b393
|
new archive
|
2012-08-30 14:44:55 +08:00 |
Christophe Vilayphiou
|
becf88bc20
|
Delete duplicate side_bar code
|
2012-08-30 14:39:48 +08:00 |
unknown
|
c74ebb91b8
|
archive checkbox
|
2012-08-30 14:37:56 +08:00 |
unknown
|
57717eef33
|
new archive
|
2012-08-30 14:36:48 +08:00 |
unknown
|
8a5519073b
|
new archive
|
2012-08-30 14:32:32 +08:00 |
unknown
|
29bcfa3139
|
archive checkbox
|
2012-08-30 14:19:51 +08:00 |
unknown
|
c5c7b0ca7c
|
new archive
|
2012-08-30 14:18:16 +08:00 |
unknown
|
d5cc9961e3
|
new archive
|
2012-08-30 14:14:53 +08:00 |
chris
|
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 |
unknown
|
1bfae05242
|
update item page
|
2012-08-21 17:37:25 +08:00 |
Harry Bomrah
|
2c0058e8c9
|
authorization
|
2012-08-20 23:18:50 +08:00 |
Harry Bomrah
|
faf2d914b6
|
Page added for desktop
|
2012-08-20 23:17:31 +08:00 |
Harry Bomrah
|
263cf130e2
|
tp
|
2012-08-20 23:16:54 +08:00 |
Harry Bomrah
|
aef1bfaba3
|
Button fixes
|
2012-08-20 23:16:54 +08:00 |
Harry Bomrah
|
69304fda43
|
UI modifications
|
2012-08-20 23:16:06 +08:00 |
devin
|
abd1a9ecbc
|
gallery update
|
2012-08-20 23:14:11 +08:00 |
Harry Bomrah
|
1ba87982ba
|
Multi language and side bar update
|
2012-08-20 23:14:11 +08:00 |
Harry Bomrah
|
587595f815
|
gallery translation supported
|
2012-08-20 23:14:11 +08:00 |
Harry Bomrah
|
0333f97bf3
|
Gallery update..
|
2012-08-20 23:14:10 +08:00 |
Harry Bomrah
|
797c9e57b8
|
Gallery update
|
2012-08-20 23:14:10 +08:00 |
Harry Bomrah
|
1daf405b3d
|
Gallery started.
|
2012-08-20 23:14:10 +08:00 |
devin
|
801c7cab0c
|
tinyscroll bar update
|
2012-08-20 23:11:32 +08:00 |
Harry Bomrah
|
1efb807246
|
tinyscrollbar extension
|
2012-08-20 23:11:32 +08:00 |
unknown
|
23a3a7eff6
|
update archive
|
2012-08-20 17:14:13 +08:00 |
chris
|
3c283d1a7a
|
Set default picture
Fix tags where not in params for index fronted (news and announcement)
Change backend index for news
Home banner link for images and main title
|
2012-08-16 17:24:12 +08:00 |
Christophe Vilayphiou
|
96fd89cca3
|
Fix js for ie in list
|
2012-08-16 01:09:45 +08:00 |
Christophe Vilayphiou
|
53c5f6a3b9
|
New css and images for rss
|
2012-08-15 18:00:55 +08:00 |
Christophe Vilayphiou
|
0d330edfa3
|
New css and images for rss
|
2012-08-15 17:42:45 +08:00 |
Christophe Vilayphiou
|
43bc704468
|
Error popup only shows on flash[:error]
|
2012-08-15 15:55:29 +08:00 |
Christophe Vilayphiou
|
a19a5415c1
|
Ray's changes for list.css
|
2012-08-15 12:13:58 +08:00 |
Christophe Vilayphiou
|
fb53ad524a
|
Add time to announcement quick edit
Fix picture for news quick edit
Fix tags not saving when empty
Hide role in quick edit
|
2012-08-14 14:38:21 +08:00 |
Christophe Vilayphiou
|
ab1c457a51
|
Add i18n for message in editor pop-up
|
2012-08-14 01:20:45 +08:00 |
Harry Bomrah
|
9ff60d2ba4
|
form validation again
|
2012-08-14 01:02:45 +08:00 |
Harry Bomrah
|
ffa49fd092
|
form validation
|
2012-08-14 01:02:45 +08:00 |
Christophe Vilayphiou
|
9196deb997
|
Merge branch 'master' of github.com:Rulingcom/NCCU
|
2012-08-14 01:00:25 +08:00 |
Christophe Vilayphiou
|
c32b0dd4b4
|
Move delete checkboxes to js
|
2012-08-14 00:59:01 +08:00 |
Matthew K. Fu JuYuan
|
83569fac82
|
Merge branch 'master' of github.com:Rulingcom/NCCU
|
2012-08-13 18:36:04 +08:00 |
Matthew K. Fu JuYuan
|
6cc470ede9
|
nccu fix
|
2012-08-13 18:35:47 +08:00 |
Christophe Vilayphiou
|
18e18a4add
|
Fix for banner on ie
|
2012-08-13 15:10:53 +08:00 |
Christophe Vilayphiou
|
c2f3f45196
|
Fix for link in nccu widget
|
2012-08-13 11:34:14 +08:00 |
Christophe Vilayphiou
|
92fc0c8c26
|
Merge branch 'master' of github.com:Rulingcom/NCCU
|
2012-08-13 11:20:23 +08:00 |