Harry Bomrah
d61ff5f91c
apps update -- app upload and activation
2013-06-18 15:27:53 +08:00
Harry Bomrah
7e6433f71c
solved desktop conflict during cherry pick
2013-06-18 15:24:41 +08:00
8c1e65994a
Merge branch 'clean_development' into lukas/picked_ques
2013-06-06 19:08:59 +08:00
adc15951bb
questionnaire stuff
...
Conflicts:
vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
2013-06-06 18:29:58 +08:00
253cca06cc
New widget for tag cloud
2013-06-06 17:17:45 +08:00
37aa950028
user action
2013-05-23 11:55:57 +08:00
2945e14385
use rack gridfs
2013-04-25 20:37:13 +08:00
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
b198b1a17b
system preference
2013-04-24 19:21:11 +08:00
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
Harry Bomrah
dae3f069ff
app manager changed plus some changes
2013-04-17 11:09:56 +08:00
Harry Bomrah
b8ee2fd559
compatibility page added and tinyscrollbar drag event fixed..
2013-04-17 11:07:20 +08:00
0dabd5b95f
fix widget field reload
2013-02-27 10:51:41 +08:00
13c757e8a9
clean add/edit page and add conference list page
2013-02-21 13:58:30 +08:00
a9fecec985
Add pagination to default widget for front end page
2013-02-19 17:41:01 +08:00
2a61470f8b
back_end widget breadcrumb finish
2013-02-19 17:24:19 +08:00
0a115906f1
fix i18n,reload problems
2013-02-19 14:21:54 +08:00
d4df7c82d3
relpace seminar to conference
2013-02-04 18:01:38 +08:00
87a89f81ce
Fix bug for mobile app routes
2013-02-04 18:01:03 +08:00
979df9ac80
daily commit
2013-01-23 18:51:18 +08:00
0cc616f988
page can use default widget
2013-01-21 16:56:37 +08:00
bf31d0c3dd
modularized personal journal
2013-01-14 17:54:52 +08:00
141eb7e723
Add mobile but remove news in it
2013-01-14 17:38:44 +08:00
84e4a558be
member roles edit
2013-01-14 17:02:51 +08:00
4e2cbac027
Remove bottom padding if no footer in mobile
...
Add a method in routes
Copy mobile routes under the scope 'app' for app usage
2013-01-11 19:14:48 +08:00
5ab4bbd367
add ad_banner inner page,pic title.
2013-01-09 16:54:33 +08:00
a34da20e48
Merge branch 'master' into desktop
...
* master: (57 commits)
Add translations
Add mobile version in site settings
Add mobile but remove news in it
Remove mysql
Fix album widget options
Fix link for ad_banner Add missing helper for web_link_category Show design's js in front-end
Add link to default widget (temporary)
Ika's fix for width
Ika's fix for width
Gallery i18n
Ika's changes for css default widgets
Ika's changes for css default widgets
change bulletin object to bulletin title
fixing default widget error when needs image
make default widget works without init
Fix order in structure
Fix old tags
correct pic file format
complete page error handler logic
change sub_menu to header in site setting
...
2013-01-07 16:44:05 +08:00
4ee683aa9b
fixed desktop route
2013-01-07 16:38:02 +08:00
37740adb24
Add mobile but remove news in it
2013-01-07 03:03:38 +08:00
a70110f787
make default widget works without init
2013-01-03 19:38:14 +08:00
fcbba6660b
Only one parser for front end
...
Separate site map for i18n
2012-12-19 17:15:31 +08:00
Harry Bomrah
9dde79414d
all sections and sections megerd
2012-12-07 12:38:23 +08:00
ff435a4af4
Change the design for the whole site form designs index
2012-12-07 12:14:31 +08:00
6f1748d2b3
- template list/show is loaded from central server
...
- buy a template downloads and creates it in DB
- changes in designs index
2012-12-06 23:20:27 +08:00
4ae7ac8388
clean route table about desktop
2012-12-06 07:59:42 +08:00
7822ffc33d
can add relation between co-author
2012-12-04 00:31:06 +08:00
5986817e16
add journal_list. now, those pair, (journal_title, journal_levels), is uniq
2012-12-04 00:31:06 +08:00
8a7ae3f061
correct user passwd and sent json to front-end
2012-12-04 00:31:06 +08:00
036d7bbb0e
Module store
2012-11-29 02:02:37 +08:00
06335f9bd1
Joshua's html
2012-11-29 00:59:46 +08:00
8a79d7ff2e
member selects
2012-11-26 10:25:34 +08:00
996a69f595
add co-author json
2012-11-23 10:44:48 +08:00
91005bb00a
routes fixed
2012-11-21 17:39:01 +08:00
ccfecb8243
add co-author page and new it, but can't destory it...
2012-11-21 01:54:06 +08:00
8abb20b4c8
add edit function
2012-11-19 12:07:24 +08:00
26436395f5
finished some method of list and journal
2012-11-18 03:07:50 +08:00
a56d80698f
desktop api update..
2012-11-12 15:11:36 +08:00
b40d4702d5
Merge branch 'master' into various_bugs
...
Conflicts:
config/locales/en.yml
config/locales/zh_tw.yml
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb
2012-11-06 11:44:00 +08:00
da5e7f670e
Desktop Widgtes updates..
2012-11-06 10:36:34 +08:00
ca3e06c58b
update for desktop widgets
2012-11-05 11:40:11 +08:00
Harry Bomrah
iCross
chris
Matt K. Fu
Spen
Fu Matthew
Rueshyna
unknown
Harry Bomrah