developers
/
orbit-basic
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,174 Commits 5 Branches 0 Tags 52 MiB
Commit Graph

2174 Commits

Author SHA1 Message Date
Rueshyna 452b1525de Merge branch 'publication' of https://github.com/Rulingcom/orbit into publication 
* 'publication' of https://github.com/Rulingcom/orbit:
  autocomplete done
 2012-11-27 15:57:18 +08:00
Harry Bomrah 9cc518b456 autocomplete done 2012-11-27 15:55:32 +08:00
Rueshyna 46576c6947 modify fake data 2012-11-27 00:18:34 +08:00
Rueshyna 6de62318c5 fake data for journal and coauthor 2012-11-27 00:05:04 +08:00
Rueshyna c9e3d5271a remove '"' candidate list 2012-11-26 16:06:22 +08:00
Rueshyna 0125010a05 modified error msgs and cancle button, but those two have bug... 2012-11-26 15:45:51 +08:00
Rueshyna 613bbec1f0 Merge branch 'autocomplete' into publication 
* autocomplete:
  add autocomplete js
 2012-11-26 14:44:52 +08:00
Rueshyna 065d38c797 add autocomplete js 2012-11-26 14:44:35 +08:00
Rueshyna f2d1b0eaf7 Merge branch 'fake_journal_data' into publication 
* fake_journal_data:
  make a 'real' fake data
 2012-11-26 14:05:50 +08:00
Rueshyna 5e04ec70a3 make a 'real' fake data 2012-11-26 11:52:11 +08:00
Rueshyna 10c1b3e6a2 Merge branch 'master' of https://github.com/Rulingcom/orbit 
* 'master' of https://github.com/Rulingcom/orbit: (136 commits)
  member selects
  add paper status textfield
  fix for showing subroles
  member selects
  fix for showing subroles
  add paper status textfield
  delete fixed
  fixed delete function
  delete update
  add co-author json
  user roles starts
  disable data transform when switching attribute field type. new member stable
  correct 'edit' button of journal list
  make fake data
  fix for json and some other bugs
  add delete link
  fixed add journal and co-author curd problem, but have redirect problem...
  hidden file field, and fixed updated function
  Fix album images display
  user roles starts
  ...
 2012-11-26 11:36:13 +08:00
chris 6b248a949b Merge branch 'member_plugin' of github.com:Rulingcom/orbit into member_plugin 2012-11-26 10:25:57 +08:00
unknown 8a79d7ff2e member selects 2012-11-26 10:25:34 +08:00
chris 4e7ff62c2b Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP 2012-11-26 10:24:15 +08:00
Rueshyna 9061448c5f add paper status textfield 2012-11-26 10:23:50 +08:00
chris 23de4f72a6 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member 2012-11-26 10:22:52 +08:00
Matthew K. Fu JuYuan 9a684f54b4 fix for showing subroles 2012-11-26 10:22:36 +08:00
unknown 1f0287dd7e member selects 2012-11-26 10:14:43 +08:00
Matthew K. Fu JuYuan 046dbc9524 fix for showing subroles 2012-11-26 10:08:06 +08:00
Rueshyna 6d861f8be0 add paper status textfield 2012-11-26 09:37:24 +08:00
chris 1e89c30150 Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP 2012-11-26 05:02:58 +08:00
Rueshyna 274d4b5cff 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:
  delete fixed
 2012-11-23 13:22:46 +08:00
Harry Bomrah 3933c048b0 delete fixed 2012-11-23 13:22:01 +08:00
Rueshyna 8009c6aa34 fixed delete function 2012-11-23 12:28:36 +08:00
Rueshyna e06495d4ad 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:
  delete update
 2012-11-23 10:50:10 +08:00
Harry Bomrah f38f32ac8b delete update 2012-11-23 10:46:42 +08:00
Rueshyna 996a69f595 add co-author json 2012-11-23 10:44:48 +08:00
chris cad03a70d5 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member 
Conflicts:
	app/controllers/admin/users_new_interface_controller.rb
 2012-11-22 21:11:57 +08:00
Matthew K. Fu JuYuan 5b39d10ac6 user roles starts 2012-11-22 21:10:35 +08:00
Matthew K. Fu JuYuan 77386f0284 disable data transform when switching attribute field type. new member stable 2012-11-22 21:10:35 +08:00
chris edf38644c9 Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP 2012-11-22 21:06:41 +08:00
Rueshyna f6d3b4a9e9 correct 'edit' button of journal list 2012-11-22 21:06:31 +08:00
Rueshyna 43f6b7b271 make fake data 2012-11-22 21:06:31 +08:00
Harry Bomrah 868d1c2201 fix for json and some other bugs 2012-11-22 21:06:30 +08:00
Rueshyna e29583ed1f add delete link 2012-11-22 21:06:30 +08:00
Rueshyna 78500e0661 fixed add journal and co-author curd problem, but have redirect problem... 2012-11-22 21:06:30 +08:00
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