Commit Graph

3389 Commits

Author SHA1 Message Date
Rueshyna c281ae9447 hidden file field, and fixed updated function 2012-11-22 21:06:30 +08:00
chris 6a12aec67c Fix album images display 2012-11-22 20:01:10 +08:00
Matthew K. Fu JuYuan cc7907f37a user roles starts 2012-11-22 18:20:11 +08:00
Rueshyna 9189ebffee correct 'edit' button of journal list 2012-11-22 18:15:07 +08:00
Matthew K. Fu JuYuan 6dff83339a disable data transform when switching attribute field type. new member stable 2012-11-22 17:49:44 +08:00
Rueshyna 773cd2b190 Merge branch 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit into make_jsFunc_for_journalP
* 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit:
  fix for json and some other bugs
2012-11-22 16:34:29 +08:00
Rueshyna 645f25d446 make fake data 2012-11-22 16:34:20 +08:00
Harry Bomrah 90fd9de5a8 fix for json and some other bugs 2012-11-22 16:31:52 +08:00
Rueshyna e453cfce9c add delete link 2012-11-22 15:21:43 +08:00
Rueshyna c0ac69fc84 Merge branch 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit into make_jsFunc_for_journalP
* 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit:
  calendar js minor update
  Fix:   - Widgets for announcement   - Facebook link   - AdBanner nav
  visitor now can browse gallery
  routes fixed
  small fix for journal_pages desktop
  new file created for journal pages
  tmp
  add co-author db and curd page, but it can't destory it...
  add co-author page and new it, but can't destory it...
  visitor now can browse gallery
  done add journals function
  fix and hide for visitors,except for album
  album and gallery is now opened
  fixed sutpid bug for calendar
  back button fix for frontend
  fix and hide for visitors,except for album
  calendar js minor update
  minor update for gallery and calendar backend
2012-11-22 10:51:30 +08:00
Rueshyna 9e400e6e6a fixed add journal and co-author curd problem, but have redirect problem... 2012-11-22 10:49:54 +08:00
chris 39adbb35c1 Remove before_filter for sub_manager in users 2012-11-22 09:37:31 +08:00
chris 475642d375 Remove news and fix default_url in ImageUploader 2012-11-22 09:30:25 +08:00
Rueshyna bb69a059e8 hidden file field, and fixed updated function 2012-11-22 02:37:56 +08:00
chris 0d26f48c9a Merge branch 'desktop_devin' of github.com:Rulingcom/orbit into desktop_devin 2012-11-21 19:03:10 +08:00
devin 25a9987f13 calendar js minor update 2012-11-21 19:02:54 +08:00
chris f8692280e5 Merge branch 'openness' of github.com:Rulingcom/orbit into openness 2012-11-21 18:59:53 +08:00
Matthew K. Fu JuYuan 1dc44e34ac Merge commit 'ef3fddd863dcfe90f2a352206bdef0ff85af53f0' into openness
Conflicts:
	vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb
2012-11-21 18:45:46 +08:00
chris 2d0e8b37b2 Fix:
- Widgets for announcement
  - Facebook link
  - AdBanner nav
2012-11-21 18:42:14 +08:00
chris bfa6579aad Merge branch 'openness' of github.com:Rulingcom/orbit into openness 2012-11-21 18:39:50 +08:00
Matthew K. Fu JuYuan ec0ec46303 visitor now can browse gallery 2012-11-21 18:39:28 +08:00
chris 6ca52226ba Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP
Conflicts:
	app/views/desktop/journal_p.html.erb
2012-11-21 18:38:28 +08:00
Harry Bomrah 73e76f2477 routes fixed 2012-11-21 18:36:56 +08:00
Harry Bomrah c53581c999 small fix for journal_pages desktop 2012-11-21 18:36:56 +08:00
Harry Bomrah 0b9af044ba new file created for journal pages 2012-11-21 18:36:56 +08:00
Rueshyna b47be52309 tmp 2012-11-21 18:36:56 +08:00
Rueshyna d502f561ef add co-author db and curd page, but it can't destory it... 2012-11-21 18:36:32 +08:00
Rueshyna 6a9426c9c8 add co-author page and new it, but can't destory it... 2012-11-21 18:36:32 +08:00
Matthew K. Fu JuYuan f9b5f71930 visitor now can browse gallery 2012-11-21 18:34:15 +08:00
Rueshyna 5006cd2f61 done add journals function 2012-11-21 18:34:03 +08:00
chris 0aaadbc82d Merge branch 'openness' of github.com:Rulingcom/orbit into openness
Conflicts:
	vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb
2012-11-21 18:33:04 +08:00
Matthew K. Fu JuYuan 1279af0c11 fix and hide for visitors,except for album 2012-11-21 18:31:57 +08:00
Matthew K. Fu JuYuan 1f8f58e930 album and gallery is now opened 2012-11-21 17:52:25 +08:00
Rueshyna 262df57298 Merge branch 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit into make_jsFunc_for_journalP
* 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit:
  routes fixed
2012-11-21 17:48:03 +08:00
Harry Bomrah 91005bb00a routes fixed 2012-11-21 17:39:01 +08:00
Rueshyna 24bb56416e Merge branch 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit into make_jsFunc_for_journalP
* 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit:
  small fix for journal_pages desktop
2012-11-21 17:12:22 +08:00
Harry Bomrah c94940214c small fix for journal_pages desktop 2012-11-21 17:11:18 +08:00
Harry Bomrah ef3fddd863 fixed sutpid bug for calendar 2012-11-21 16:55:18 +08:00
Rueshyna b4e058e557 Merge branch 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit into make_jsFunc_for_journalP
* 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit:
  new file created for journal pages
2012-11-21 15:36:35 +08:00
Harry Bomrah b571373c8f new file created for journal pages 2012-11-21 15:35:23 +08:00
Harry Bomrah 9fc8ec8e16 back button fix for frontend 2012-11-21 15:00:07 +08:00
Rueshyna 5c0b137c6d tmp 2012-11-21 14:52:26 +08:00
Matthew K. Fu JuYuan fda7c43efc Merge branch 'master' of github.com:Rulingcom/orbit into openness 2012-11-21 11:46:44 +08:00
Matthew K. Fu JuYuan ee053cd8ac fix and hide for visitors,except for album 2012-11-21 11:46:06 +08:00
devin 2cc1ed1db7 calendar js minor update 2012-11-21 11:16:23 +08:00
Rueshyna da1b871481 merge 2012-11-21 10:46:33 +08:00
chris 4966537491 Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP 2012-11-21 07:38:10 +08:00
Harry Bomrah 8f65284932 Desktop updates various 2012-11-21 07:37:44 +08:00
Rueshyna b359d5d566 some bugs 2012-11-21 07:37:44 +08:00
Rueshyna 703324063e change journal list json link 2012-11-21 07:37:44 +08:00