Commit Graph

  • 613bbec1f0 Merge branch 'autocomplete' into publication Rueshyna 2012-11-26 14:44:52 +0800
  • 065d38c797 add autocomplete js Rueshyna 2012-11-26 14:44:35 +0800
  • f2d1b0eaf7 Merge branch 'fake_journal_data' into publication Rueshyna 2012-11-26 14:05:50 +0800
  • 5e04ec70a3 make a 'real' fake data Rueshyna 2012-11-26 11:52:11 +0800
  • 10c1b3e6a2 Merge branch 'master' of https://github.com/Rulingcom/orbit Rueshyna 2012-11-26 11:36:13 +0800
  • 6b248a949b Merge branch 'member_plugin' of github.com:Rulingcom/orbit into member_plugin chris 2012-11-26 10:25:57 +0800
  • 8a79d7ff2e member selects unknown 2012-11-26 10:14:43 +0800
  • 4e7ff62c2b Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP chris 2012-11-26 10:24:15 +0800
  • 9061448c5f add paper status textfield Rueshyna 2012-11-26 09:37:24 +0800
  • 23de4f72a6 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member chris 2012-11-26 10:22:52 +0800
  • 9a684f54b4 fix for showing subroles Matthew K. Fu JuYuan 2012-11-26 10:08:06 +0800
  • 1f0287dd7e member selects unknown 2012-11-26 10:14:43 +0800
  • 046dbc9524 fix for showing subroles Matthew K. Fu JuYuan 2012-11-26 10:08:06 +0800
  • 6d861f8be0 add paper status textfield Rueshyna 2012-11-26 09:37:24 +0800
  • 1e89c30150 Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP chris 2012-11-26 05:02:58 +0800
  • 274d4b5cff Merge branch 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit into make_jsFunc_for_journalP Rueshyna 2012-11-23 13:22:46 +0800
  • 3933c048b0 delete fixed Harry Bomrah 2012-11-23 13:22:01 +0800
  • 8009c6aa34 fixed delete function Rueshyna 2012-11-23 12:28:36 +0800
  • e06495d4ad Merge branch 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit into make_jsFunc_for_journalP Rueshyna 2012-11-23 10:50:10 +0800
  • f38f32ac8b delete update Harry Bomrah 2012-11-23 10:46:42 +0800
  • 996a69f595 add co-author json Rueshyna 2012-11-23 10:44:48 +0800
  • cad03a70d5 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member chris 2012-11-22 21:11:57 +0800
  • 5b39d10ac6 user roles starts Matthew K. Fu JuYuan 2012-11-22 18:20:11 +0800
  • 77386f0284 disable data transform when switching attribute field type. new member stable Matthew K. Fu JuYuan 2012-11-22 17:49:44 +0800
  • edf38644c9 Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP chris 2012-11-22 21:06:41 +0800
  • f6d3b4a9e9 correct 'edit' button of journal list Rueshyna 2012-11-22 18:15:07 +0800
  • 43f6b7b271 make fake data Rueshyna 2012-11-22 16:34:20 +0800
  • 868d1c2201 fix for json and some other bugs Harry Bomrah 2012-11-22 16:31:37 +0800
  • e29583ed1f add delete link Rueshyna 2012-11-22 15:21:43 +0800
  • 78500e0661 fixed add journal and co-author curd problem, but have redirect problem... Rueshyna 2012-11-22 10:49:54 +0800
  • c281ae9447 hidden file field, and fixed updated function Rueshyna 2012-11-22 02:37:56 +0800
  • 6a12aec67c Fix album images display chris 2012-11-22 20:01:10 +0800
  • cc7907f37a user roles starts Matthew K. Fu JuYuan 2012-11-22 18:20:11 +0800
  • 9189ebffee correct 'edit' button of journal list Rueshyna 2012-11-22 18:15:07 +0800
  • 6dff83339a disable data transform when switching attribute field type. new member stable Matthew K. Fu JuYuan 2012-11-22 17:49:44 +0800
  • 773cd2b190 Merge branch 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit into make_jsFunc_for_journalP Rueshyna 2012-11-22 16:34:29 +0800
  • 645f25d446 make fake data Rueshyna 2012-11-22 16:34:20 +0800
  • 90fd9de5a8 fix for json and some other bugs Harry Bomrah 2012-11-22 16:31:37 +0800
  • e453cfce9c add delete link Rueshyna 2012-11-22 15:21:43 +0800
  • c0ac69fc84 Merge branch 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit into make_jsFunc_for_journalP Rueshyna 2012-11-22 10:51:30 +0800
  • 9e400e6e6a fixed add journal and co-author curd problem, but have redirect problem... Rueshyna 2012-11-22 10:49:54 +0800
  • 39adbb35c1 Remove before_filter for sub_manager in users chris 2012-11-22 09:37:31 +0800
  • 475642d375 Remove news and fix default_url in ImageUploader chris 2012-11-22 09:30:25 +0800
  • bb69a059e8 hidden file field, and fixed updated function Rueshyna 2012-11-22 02:37:56 +0800
  • 0d26f48c9a Merge branch 'desktop_devin' of github.com:Rulingcom/orbit into desktop_devin chris 2012-11-21 19:03:10 +0800
  • 25a9987f13 calendar js minor update devin 2012-11-21 11:16:23 +0800
  • f8692280e5 Merge branch 'openness' of github.com:Rulingcom/orbit into openness chris 2012-11-21 18:59:53 +0800
  • 1dc44e34ac Merge commit 'ef3fddd863dcfe90f2a352206bdef0ff85af53f0' into openness Matthew K. Fu JuYuan 2012-11-21 18:45:46 +0800
  • 2d0e8b37b2 Fix: - Widgets for announcement - Facebook link - AdBanner nav chris 2012-11-21 18:42:14 +0800
  • bfa6579aad Merge branch 'openness' of github.com:Rulingcom/orbit into openness chris 2012-11-21 18:39:50 +0800
  • ec0ec46303 visitor now can browse gallery Matthew K. Fu JuYuan 2012-11-21 18:34:15 +0800
  • 6ca52226ba Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP chris 2012-11-21 18:38:28 +0800
  • 73e76f2477 routes fixed Harry Bomrah 2012-11-21 17:39:01 +0800
  • c53581c999 small fix for journal_pages desktop Harry Bomrah 2012-11-21 17:11:18 +0800
  • 0b9af044ba new file created for journal pages Harry Bomrah 2012-11-21 15:35:23 +0800
  • b47be52309 tmp Rueshyna 2012-11-21 14:52:26 +0800
  • d502f561ef add co-author db and curd page, but it can't destory it... Rueshyna 2012-11-21 01:56:30 +0800
  • 6a9426c9c8 add co-author page and new it, but can't destory it... Rueshyna 2012-11-21 01:54:06 +0800
  • f9b5f71930 visitor now can browse gallery Matthew K. Fu JuYuan 2012-11-21 18:34:15 +0800
  • 5006cd2f61 done add journals function Rueshyna 2012-11-20 14:58:15 +0800
  • 0aaadbc82d Merge branch 'openness' of github.com:Rulingcom/orbit into openness chris 2012-11-21 18:33:04 +0800
  • 1279af0c11 fix and hide for visitors,except for album Matthew K. Fu JuYuan 2012-11-21 11:46:06 +0800
  • 1f8f58e930 album and gallery is now opened Matthew K. Fu JuYuan 2012-11-21 17:52:25 +0800
  • 262df57298 Merge branch 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit into make_jsFunc_for_journalP Rueshyna 2012-11-21 17:48:03 +0800
  • 91005bb00a routes fixed Harry Bomrah 2012-11-21 17:39:01 +0800
  • 24bb56416e Merge branch 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit into make_jsFunc_for_journalP Rueshyna 2012-11-21 17:12:22 +0800
  • c94940214c small fix for journal_pages desktop Harry Bomrah 2012-11-21 17:11:18 +0800
  • ef3fddd863 fixed sutpid bug for calendar Harry Bomrah 2012-11-21 16:55:18 +0800
  • b4e058e557 Merge branch 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit into make_jsFunc_for_journalP Rueshyna 2012-11-21 15:36:35 +0800
  • b571373c8f new file created for journal pages Harry Bomrah 2012-11-21 15:35:23 +0800
  • 9fc8ec8e16 back button fix for frontend Harry Bomrah 2012-11-21 15:00:07 +0800
  • 5c0b137c6d tmp Rueshyna 2012-11-21 14:52:26 +0800
  • fda7c43efc Merge branch 'master' of github.com:Rulingcom/orbit into openness Matthew K. Fu JuYuan 2012-11-21 11:46:44 +0800
  • ee053cd8ac fix and hide for visitors,except for album Matthew K. Fu JuYuan 2012-11-21 11:46:06 +0800
  • 2cc1ed1db7 calendar js minor update devin 2012-11-21 11:16:23 +0800
  • da1b871481 merge Rueshyna 2012-11-21 10:46:33 +0800
  • 4966537491 Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP chris 2012-11-21 07:38:10 +0800
  • 8f65284932 Desktop updates various Harry Bomrah 2012-11-20 17:20:05 +0800
  • b359d5d566 some bugs Rueshyna 2012-11-19 16:28:05 +0800
  • 703324063e change journal list json link Rueshyna 2012-11-19 12:13:05 +0800
  • d7599f1ccf add edit function Rueshyna 2012-11-19 12:07:24 +0800
  • a3edebce6a midify checkbox value Rueshyna 2012-11-18 14:15:00 +0800
  • 5eb8cc4063 finished some method of list and journal Rueshyna 2012-11-18 03:07:50 +0800
  • 7e9b60a527 split form from add.html.erb Rueshyna 2012-11-16 16:02:17 +0800
  • fe373fad92 add.html convert to add.html.erb done Rueshyna 2012-11-16 15:33:31 +0800
  • ae10a2b8a2 convert html template to html.erb Rueshyna 2012-11-16 12:54:21 +0800
  • 1c6badfb10 add more fake data Rueshyna 2012-11-16 09:13:51 +0800
  • b6004958c9 make it real Rueshyna 2012-11-16 01:54:10 +0800
  • bf4c75fcdc add new function Rueshyna 2012-11-16 01:53:45 +0800
  • fd3fa19573 add fake data, execute by rake db:seed Rueshyna 2012-11-16 01:53:17 +0800
  • f93d019ba0 check file type Rueshyna 2012-11-15 22:39:01 +0800
  • 61c0c4b542 modified file of view bug Rueshyna 2012-11-15 11:18:55 +0800
  • 97ffb5ff18 file view update Harry Bomrah 2012-11-14 21:12:10 +0800
  • 02643c12bf modified getjournals format Rueshyna 2012-11-14 17:27:36 +0800
  • 5643b0a528 delete demo db of journal and paper Rueshyna 2012-11-13 17:22:25 +0800
  • 4ce10d2fd9 make a json format for view of journal_p Rueshyna 2012-11-13 17:21:23 +0800
  • 048e8dd7ab Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit chris 2012-11-21 07:37:20 +0800
  • f2e76d27b8 minor update for gallery and calendar backend devin 2012-11-20 18:04:23 +0800
  • 95fc5676bf add co-author db and curd page, but it can't destory it... Rueshyna 2012-11-21 01:56:30 +0800
  • ccfecb8243 add co-author page and new it, but can't destory it... Rueshyna 2012-11-21 01:54:06 +0800