Commit Graph

190 Commits

Author SHA1 Message Date
Harry Bomrah 49d1ca6997 new type fixed 2012-12-04 00:31:46 +08:00
Rueshyna 5d6dd8cded separate relation list from index page and render it 2012-12-04 00:31:46 +08:00
Rueshyna e143f9a345 can select relection from relation db 2012-12-04 00:31:46 +08:00
Harry Bomrah 0e6c75e677 form for coauthor - fixed 2012-12-04 00:31:07 +08:00
Harry Bomrah a6a50227eb new type fixed 2012-12-04 00:31:07 +08:00
Harry Bomrah f7f55850fe coauthor edit and destroy fixed 2012-12-04 00:31:07 +08:00
Rueshyna 7822ffc33d can add relation between co-author 2012-12-04 00:31:06 +08:00
Rueshyna 5dabfe9319 refine co-authro page 2012-12-04 00:31:06 +08:00
Rueshyna 5986817e16 add journal_list. now, those pair, (journal_title, journal_levels), is uniq 2012-12-04 00:31:06 +08:00
Rueshyna 7f7b33f310 fixed journal update method 2012-12-04 00:31:06 +08:00
Rueshyna 6426fb74d9 remove edit page cancel buttom 2012-12-04 00:25:58 +08:00
Harry Bomrah d70ef4666b delete fixed.. 2012-12-04 00:25:58 +08:00
Harry Bomrah 43a9f231a6 multiple file fixed 2012-12-04 00:25:58 +08:00
Rueshyna d806e8cf82 have done multiple file 2012-12-04 00:25:58 +08:00
Rueshyna 4a0cc61852 can add multiple file 2012-12-04 00:25:58 +08:00
Rueshyna 5a9d9151d9 add journal list template 2012-12-04 00:25:58 +08:00
Rueshyna 6ed1dd0cc6 change template 2012-11-28 23:43:39 +08:00
Rueshyna 7853aec886 Merge branch 'publication' into multiple_file_upload
* publication:
  url fixed and edit form fixed for tinyscrollbar
2012-11-28 18:19:06 +08:00
Rueshyna 6d159a3a9e add templete 2012-11-28 18:12:37 +08:00
Rueshyna 254a81fa5d add templete 2012-11-28 18:12:21 +08:00
Harry Bomrah 2f67a96532 url fixed and edit form fixed for tinyscrollbar 2012-11-28 18:12:00 +08:00
Rueshyna 25324809bb add account link 2012-11-28 14:42:15 +08:00
Harry Bomrah 9cc518b456 autocomplete done 2012-11-27 15:55:32 +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 065d38c797 add autocomplete js 2012-11-26 14:44:35 +08:00
Rueshyna 9061448c5f add paper status textfield 2012-11-26 10:23:50 +08:00
Rueshyna 996a69f595 add co-author json 2012-11-23 10:44:48 +08:00
Rueshyna 9e400e6e6a fixed add journal and co-author curd problem, but have redirect problem... 2012-11-22 10:49:54 +08:00
Rueshyna bb69a059e8 hidden file field, and fixed updated function 2012-11-22 02:37:56 +08:00
Harry Bomrah c94940214c small fix for journal_pages desktop 2012-11-21 17:11:18 +08:00
Rueshyna 5c0b137c6d tmp 2012-11-21 14:52:26 +08:00
Rueshyna da1b871481 merge 2012-11-21 10:46:33 +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 d7599f1ccf add edit function 2012-11-21 07:37:43 +08:00
Rueshyna a3edebce6a midify checkbox value 2012-11-21 07:37:43 +08:00
Rueshyna 5eb8cc4063 finished some method of list and journal 2012-11-21 07:37:43 +08:00
Rueshyna 7e9b60a527 split form from add.html.erb 2012-11-21 07:37:43 +08:00
Rueshyna fe373fad92 add.html convert to add.html.erb done 2012-11-21 07:37:43 +08:00
Rueshyna ae10a2b8a2 convert html template to html.erb 2012-11-21 07:37:43 +08:00
Rueshyna b6004958c9 make it real 2012-11-21 07:37:43 +08:00
Rueshyna 95fc5676bf add co-author db and curd page, but it can't destory it... 2012-11-21 01:56:30 +08:00
Rueshyna ccfecb8243 add co-author page and new it, but can't destory it... 2012-11-21 01:54:06 +08:00
Rueshyna 95a3831dce done add journals function 2012-11-20 14:58:15 +08:00
Rueshyna 398432d0fc some bugs 2012-11-19 16:28:05 +08:00
Rueshyna 8abb20b4c8 add edit function 2012-11-19 12:07:24 +08:00
Rueshyna 9501bf2df3 midify checkbox value 2012-11-18 14:15:00 +08:00
Rueshyna 26436395f5 finished some method of list and journal 2012-11-18 03:07:50 +08:00
Rueshyna 024b331cf3 split form from add.html.erb 2012-11-16 16:02:17 +08:00
Rueshyna e60480a4be add.html convert to add.html.erb done 2012-11-16 15:33:31 +08:00
Rueshyna b51397d2e2 convert html template to html.erb 2012-11-16 12:54:21 +08:00
Rueshyna b998b8f346 make it real 2012-11-16 01:54:10 +08:00
Harry Bomrah e498be9753 desktopAPI update. 2012-11-12 15:11:36 +08:00
Harry Bomrah a56d80698f desktop api update.. 2012-11-12 15:11:36 +08:00
Harry Bomrah da5e7f670e Desktop Widgtes updates.. 2012-11-06 10:36:34 +08:00
Harry Bomrah faf2d914b6 Page added for desktop 2012-08-20 23:17:31 +08:00
devin 58d162d225 publication adjustment 2012-07-09 10:44:01 +08:00
Harry Bomrah 830eb8eb62 Timeline design and timescale update 2012-07-06 16:11:03 +08:00
devin bfaed4deb4 timeline change 2012-07-05 16:49:03 +08:00
Harry Bomrah 312e63f242 New Timeline with books and seminar pages 2012-07-05 16:42:00 +08:00
Joshua Milton bb75383ef0 Seminar Pages modified 2012-07-05 16:27:59 +08:00
Harry Bomrah 6923b82284 Added seminar section 2012-07-04 19:12:02 +08:00
Joshua Milton 6b9926539d Merge branch 'desktop_joshua' of https://github.com/Rulingcom/orbit into desktop_joshua
Conflicts:
	app/assets/javascripts/orbitdesktop.js
	app/controllers/desktop_publications_controller.rb
	config/routes.rb
2012-07-04 18:31:00 +08:00
Joshua Milton 3f42a22094 Books section added 2012-07-04 17:55:30 +08:00
devin 08fd07b6aa timeline and font update 2012-07-02 16:22:51 +08:00
devin 6533abf214 font awesome update 2012-07-02 11:10:01 +08:00
Harry Bomrah 7151102a86 new page add and timeline changes 2012-06-28 17:31:48 +08:00
Harry Bomrah 4aa155a44d timeline updates major ones.. 2012-06-26 21:09:33 +08:00
Harry Bomrah 555ec86403 Timeline commit 2012-06-26 15:59:28 +08:00
devin a78b72ebfc app update 2012-05-21 15:25:18 +08:00
devin ab7ae6dcee app 2012-05-21 14:55:51 +08:00
Harry Bomrah 1a9fa8f505 Merge branch 'desktop_harry' into desktop_devin 2012-05-11 15:28:05 +08:00
Harry Bomrah 2c3637e9b4 very important update for widgets management.. 2012-05-11 15:27:16 +08:00
devin ada56a7a63 some update 2012-05-10 10:54:43 +08:00
Harry Bomrah 2083e0bf4f widget structure improvised… 2012-05-07 19:00:50 +08:00
Harry Bomrah fcc875bb5d app store page added… and few other changes.. 2012-05-04 20:28:12 +08:00
Harry Bomrah 3ad11f2098 View functionality, changed controller, journal and pages collections 2012-05-03 21:38:03 +08:00
Harry Bomrah a3a1e4b92e controller change, views working and db for paper and journals 2012-05-03 21:30:12 +08:00
devin aeaf2f05d1 Start Add Page - no function 2012-05-03 17:59:07 +08:00
Harry Bomrah 1fce99c96f Merge branch 'desktop_harry' into desktop_devin 2012-05-03 14:42:07 +08:00
Harry Bomrah d6cbbff9de connection page working now.. 2012-05-03 14:40:54 +08:00
devin b87cf0e2ff list page 2012-05-03 14:39:22 +08:00
devin 887bda1491 lots of change 2012-05-02 17:04:16 +08:00
devin bfc4507696 Connection page design 2012-05-01 18:05:17 +08:00
Harry Bomrah 769a67f026 the group more structured and also demo connecting with gmail account.. 2012-04-30 21:17:20 +08:00
Harry Bomrah 1b7fb106f8 lot of updates 2012-04-30 14:33:12 +08:00
Harry Bomrah aacd9da9fb auto login encryption done… 2012-04-30 14:29:42 +08:00
devin 2ebba577eb journal start 2012-04-27 14:04:11 +08:00
Harry Bomrah c158375d02 with connection and some save settings… 2012-04-26 21:30:13 +08:00
Harry Bomrah 64be61d61b with gmail widget.. 2012-04-26 14:47:49 +08:00
Harry Bomrah a298cbd5f6 Publication started 2012-04-24 16:45:26 +08:00
Harry Bomrah 670ec2a40e Themes from db fixed.. 2012-04-23 21:04:02 +08:00
Harry Bomrah 8c42f6bb7c Merge branch 'desktop_harry' into desktop_devin 2012-04-20 14:44:57 +08:00
devin 19750d69e0 some update 2012-04-20 05:38:53 +08:00
Harry Bomrah 3eaf97babe title and heading and welcome msg… 2012-04-19 20:26:21 +08:00
Harry Bomrah 4bad25e682 Msg box added and background image saving complete 2012-04-18 22:01:12 +08:00
Harry Bomrah 11a0875c44 color changes in custom color… 2012-04-18 17:57:47 +08:00
devin b743413be9 function update 2012-04-18 13:17:12 +08:00
Harry Bomrah 7b391904f7 Merge branch 'desktop_devin' of https://github.com/Rulingcom/orbit into desktop_devin 2012-04-17 21:20:36 +08:00