chris
|
167a71272a
|
queries need to be rethink
|
2013-05-03 12:12:19 +08:00 |
Matt K. Fu
|
caf0426bd4
|
bulletin search
|
2013-05-01 12:16:28 +08:00 |
Matt K. Fu
|
7d077a92a5
|
system preference
|
2013-04-29 15:23:15 +08:00 |
Matt K. Fu
|
64101109dd
|
disable all sorted_tags
|
2013-04-26 18:07:59 +08:00 |
Matt K. Fu
|
3e567223e3
|
fix for Spen's translation and Chris's tag error
|
2013-04-26 15:37:27 +08:00 |
Spen
|
79ef86f2c9
|
member translation fix
|
2013-04-26 11:26:11 +08:00 |
Matthew K. Fu JuYuan
|
d047a3d62a
|
chris tags update
|
2013-04-26 11:26:10 +08:00 |
Matt K. Fu
|
2945e14385
|
use rack gridfs
|
2013-04-25 20:37:13 +08:00 |
Matt K. Fu
|
c68c563fb0
|
fix qa problem
|
2013-04-25 20:37:13 +08:00 |
Spen
|
697944a029
|
user id set & user fields set & role set & member frontend list & user translation & create new member bug fix
|
2013-04-25 19:59:59 +08:00 |
Matt K. Fu
|
12e39b4d77
|
fix rescue job won't start
|
2013-04-25 15:46:16 +08:00 |
Matt K. Fu
|
a0478f2a8f
|
fix page name repeated error when page creating
|
2013-04-25 12:19:25 +08:00 |
Matt K. Fu
|
b198b1a17b
|
system preference
|
2013-04-24 19:21:11 +08:00 |
Matt K. Fu
|
62fa589e8a
|
add msg when user session expired at page admin
|
2013-04-24 11:58:48 +08:00 |
Matt K. Fu
|
5ff7dfbac6
|
fronted open switch and backend openness
|
2013-04-23 18:48:18 +08:00 |
Harry Bomrah
|
11067ef34f
|
english mandatory removed from albums
|
2013-04-23 11:09:43 +08:00 |
Spen
|
536f0d30af
|
apps_translate_fix
|
2013-04-23 11:09:20 +08:00 |
Matt K. Fu
|
41168f4c99
|
fix for fronted routing failed
|
2013-04-23 10:01:02 +08:00 |
Matt K. Fu
|
7e9fce0c2d
|
clean Harry's code
|
2013-04-17 14:31:10 +08:00 |
Matt K. Fu
|
2416030adc
|
remove useless rake task
|
2013-04-17 14:31:09 +08:00 |
Harry Bomrah
|
38d5a193e0
|
tiny scrollbar trigger fixed and devin branch merged
|
2013-04-17 14:31:09 +08:00 |
Matt K. Fu
|
fcfdd562a6
|
reverse harrys db setting
|
2013-04-17 14:29:56 +08:00 |
devin chen
|
989e5aa974
|
minor update
|
2013-04-17 14:29:56 +08:00 |
Matt K. Fu
|
4cbf2fd8b9
|
complete harrys code
|
2013-04-17 14:29:56 +08:00 |
Spen
|
c94a86c3a4
|
web_resource rake web_link_url:web_link_url_i18n
|
2013-04-17 14:29:04 +08:00 |
devin chen
|
aedab01ae6
|
minor update
|
2013-04-17 14:29:04 +08:00 |
devin chen
|
e3782c9cf7
|
minor update
|
2013-04-17 14:29:04 +08:00 |
Harry Bomrah
|
e2802d94d0
|
rake task added
|
2013-04-17 14:28:13 +08:00 |
devin chen
|
055d758769
|
Page Loading Effect
tinyscrollbar has problem
|
2013-04-17 14:27:18 +08:00 |
Spen
|
0734f73291
|
faq show fix
|
2013-04-17 14:25:05 +08:00 |
Matt K. Fu
|
a4ebe31ada
|
fix for widget edit js missing
|
2013-04-17 14:19:32 +08:00 |
Matt K. Fu
|
3098496083
|
widget link followed by setting
|
2013-04-17 14:19:32 +08:00 |
Matt K. Fu
|
28f0df5da8
|
fix default widget link failed
|
2013-04-17 14:19:32 +08:00 |
Matt K. Fu
|
3de4591413
|
fix frontend ajax respond 404 due to javascript overwritten after assets precompile
|
2013-04-17 14:19:32 +08:00 |
devin chen
|
d177fe0369
|
minor update
|
2013-04-17 14:19:32 +08:00 |
Harry Bomrah
|
d288972035
|
stupid commit
|
2013-04-17 14:19:32 +08:00 |
Harry Bomrah
|
c6868bf2e0
|
small fix in select2.js
|
2013-04-17 14:18:49 +08:00 |
devin chen
|
95e308e046
|
minor update
|
2013-04-17 14:18:49 +08:00 |
Matt K. Fu
|
425a320c02
|
fix widget and fronted setting interface. checked with Spen
|
2013-04-17 14:16:24 +08:00 |
devin chen
|
dc5f24ab22
|
starting new branch ( add rules in .gitignore for SASS cache folder )
|
2013-04-17 14:16:24 +08:00 |
Harry Bomrah
|
bc0477a5ed
|
widget and gridster fixes
|
2013-04-17 14:16:24 +08:00 |
Matt K. Fu
|
0781779ac0
|
solved conflicts
|
2013-04-17 14:14:24 +08:00 |
devin
|
e7bffe4c0f
|
devin's new branch
|
2013-04-17 14:14:24 +08:00 |
chris
|
dd10b3147c
|
Fix js bug and asset url after merge
|
2013-04-17 14:14:24 +08:00 |
devin
|
cae43e8acd
|
recover .gitignore file
Conflicts:
.gitignore
|
2013-04-17 14:14:23 +08:00 |
Harry Bomrah
|
793d739726
|
features and widgets added
Conflicts:
app/assets/javascripts/orbitdesktop.js
|
2013-04-17 14:14:23 +08:00 |
devin
|
c8aa50ee87
|
Lots of Update
1. CSS to SCSS
2. Journal Paper update
Conflicts:
Gemfile.lock
app/assets/javascripts/orbitdesktop.js
app/assets/stylesheets/desktop/desktop-main.css
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb
|
2013-04-17 14:14:23 +08:00 |
Matt K. Fu
|
0f6f5aafce
|
fix for both part and page part settings
Conflicts:
app/helpers/admin/page_parts_helper.rb
app/views/admin/pages/reload_front_end_setting.js.erb
app/views/admin/pages/reload_frontend_pages.js.erb
|
2013-04-17 14:12:52 +08:00 |
Fu Matthew
|
f6b600df59
|
deliver API
|
2013-04-17 14:09:01 +08:00 |
chris
|
6af375efa4
|
Fix bug in setup_app_frontend_and_style
|
2013-04-17 14:09:00 +08:00 |