Commit Graph

1401 Commits

Author SHA1 Message Date
chris bab8328029 Put back old tags (don't use the class ProtoTag) 2012-12-28 10:43:48 +08:00
chris ec96a2e0e7 Add page counter 2012-12-28 10:36:18 +08:00
Rueshyna 1c07224694 fixed page_parts submit button 2012-12-28 10:12:17 +08:00
Harry Bomrah 37f8c1637a new desktop framework updates 2012-12-27 18:25:54 +08:00
Rueshyna a7cf6dd694 reverse structure order 2012-12-27 17:54:52 +08:00
chris 269e5b033f Fix for page_part and widget back-end 2012-12-27 16:20:40 +08:00
Fu Matthew 2d6b70b97f regenerate pageparts 2012-12-27 15:50:05 +08:00
Fu Matthew 2901b8e30c Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu 2012-12-27 15:06:19 +08:00
Fu Matthew 2dd0f9a9d2 fix disappear widget inter block 2012-12-27 15:06:01 +08:00
Rueshyna 9e07794cbc soft structure order 2012-12-27 14:37:29 +08:00
Rueshyna 34ed8ae39c Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu
* 'ntu' of https://github.com/Rulingcom/orbit:
  Preventing site default design being deleted.
2012-12-27 12:22:19 +08:00
Rueshyna 177a409508 fixed search_bar placeholder 2012-12-27 12:20:42 +08:00
Rueshyna 81b0e3c38f change ActiveSupport::SecureRandom to SecureRandom in orbit core 2012-12-27 12:19:42 +08:00
Fu Matthew cfb65dd056 Preventing site default design being deleted. 2012-12-27 10:26:27 +08:00
chris 507191426e Fix submenu error 2012-12-21 14:56:12 +08:00
chris e9815c3d9b Fix css bug when precompiling assets 2012-12-20 14:34:02 +08:00
chris fc076a28bd Remove useless css 2012-12-20 13:53:28 +08:00
chris d827fbc852 Comment out desktop links 2012-12-19 21:32:55 +08:00
Rueshyna b4633a2ccb .not_guest_user 2012-12-19 19:48:13 +08:00
Rueshyna 3d39c2c3c3 hidden guest user 2012-12-19 19:48:13 +08:00
Rueshyna ec1fad9729 fixed empty name of member list 2012-12-19 19:48:13 +08:00
chris 83fb5230a4 Changes for site map front end indentation 2012-12-19 17:26:38 +08:00
chris fcbba6660b Only one parser for front end
Separate site map for i18n
2012-12-19 17:15:31 +08:00
Harry Bomrah 607a4f5acf fixed fileview in english mode 2012-12-07 12:38:23 +08:00
Harry Bomrah 9dde79414d all sections and sections megerd 2012-12-07 12:38:23 +08:00
chris a1b1fc9d34 Remove test 2012-12-07 12:32:43 +08:00
chris ff435a4af4 Change the design for the whole site form designs index 2012-12-07 12:14:31 +08:00
Harry Bomrah ad8273d638 fixed fileview in english mode 2012-12-07 11:19:40 +08:00
Harry Bomrah 08b99011d0 all sections and sections megerd 2012-12-07 10:10:38 +08:00
chris c74ead8318 Redirect to designs after buying template
Randomise buy counts
2012-12-07 09:07:49 +08:00
Rueshyna a84cb560a0 make factory girl file clean 2012-12-07 04:21:26 +08:00
Harry Bomrah 59c4080f0c stupid fix 2012-12-07 04:21:26 +08:00
Harry Bomrah da3f0b58f5 section fixed and some other fixes 2012-12-07 04:21:26 +08:00
Rueshyna e87526d7bb try to fix problem 2012-12-07 04:21:26 +08:00
Harry Bomrah 3d382fec6b scroll fixed... 2012-12-07 04:21:26 +08:00
Rueshyna 39b5959de7 fixed bug about co-author-relation 2012-12-07 04:21:26 +08:00
devin 89e25fe7a2 view update 2012-12-07 04:21:26 +08:00
chris af381e75de Add images to store 2012-12-07 02:37:05 +08:00
chris 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
OrbitServer b1f2749000 Devin's changes to integrate the store 2012-12-06 23:11:23 +08:00
OrbitServer fbed496034 Harry's changes in i18n 2012-12-06 23:08:13 +08:00
Rueshyna 633a68675a make factory girl file clean 2012-12-06 22:37:42 +08:00
Harry Bomrah c2285a34f6 stupid fix 2012-12-06 18:50:24 +08:00
Harry Bomrah 8094ddc967 section fixed and some other fixes 2012-12-06 17:43:19 +08:00
Rueshyna 7430a05782 try to fix problem 2012-12-06 16:24:40 +08:00
Harry Bomrah df4a9a5dff scroll fixed... 2012-12-06 15:44:16 +08:00
Rueshyna 54de86eeb4 fixed bug about co-author-relation 2012-12-06 15:20:06 +08:00
devin 6a47fc8d62 view update 2012-12-06 11:43:40 +08:00
devin 5d76600154 view update 2012-12-06 07:59:44 +08:00
devin 756bfa563b view update 2012-12-06 07:59:44 +08:00
devin 22c0eabca5 view update 2012-12-06 07:59:44 +08:00
Harry Bomrah 3d1fb48489 edit coauthor relation done 2012-12-06 07:59:44 +08:00
Rueshyna 4681f0ee36 sort co_author name 2012-12-06 07:59:44 +08:00
Rueshyna 6d08ca996f add back buton in relation page 2012-12-06 07:59:44 +08:00
Rueshyna b4a99e58cf sort author email 2012-12-06 07:59:44 +08:00
devin 59c0cdd761 view update
not finish all required pages yet
2012-12-06 07:59:43 +08:00
Rueshyna b89e371393 can update co-author relation 2012-12-06 07:59:43 +08:00
devin a0cce2ae0d view update 2012-12-06 07:59:43 +08:00
Rueshyna e7fdac1d23 make coauthor relation can be edit 2012-12-06 07:59:43 +08:00
devin 8d110cce91 view update 2012-12-06 07:59:43 +08:00
devin d413f705a4 view update 2012-12-06 07:59:43 +08:00
devin 363ccdde4d view update 2012-12-06 07:59:43 +08:00
Harry Bomrah 79dc99d431 br fixed 2012-12-06 07:59:43 +08:00
devin 936101358c journal update 2012-12-06 07:59:43 +08:00
devin 2aa077bc85 journal list 2012-12-06 07:59:43 +08:00
devin d03f5dc1ff view update 2012-12-06 07:59:43 +08:00
Rueshyna 4ae7ac8388 clean route table about desktop 2012-12-06 07:59:42 +08:00
Rueshyna 6c33d353ba make journal list easy to read 2012-12-06 07:59:42 +08:00
Rueshyna 05027afa63 make journal list easy to read 2012-12-06 07:59:42 +08:00
Rueshyna 4f31b1362b fixed new co-author relation bug.... 2012-12-06 07:59:42 +08:00
Rueshyna 1289ad9f9d fixed co-author relation bug.... 2012-12-06 07:59:42 +08:00
Rueshyna afd8e7e380 when delete co-author relation, the co-author will be reset nil 2012-12-06 07:59:42 +08:00
Rueshyna 09c59c4e03 midify button type 2012-12-06 07:59:42 +08:00
Rueshyna 21b1432f7f change settings table default display 2012-12-06 07:59:42 +08:00
Rueshyna e0e1c30f68 delete onside widget in db 2012-12-06 07:59:42 +08:00
unknown 7d3c535e01 add info field 2012-12-06 07:58:39 +08:00
chris e68c52bc00 Changes for store back-end 2012-12-05 13:46:10 +08:00
chris 9a79e432dd Fix typo 2012-12-04 01:12:15 +08:00
chris 2983b181e6 Fix some translations 2012-12-04 01:03:28 +08:00
Harry Bomrah c6e0b56012 stupid bug fixed 2012-12-04 00:31:46 +08:00
Rueshyna 58e71c29b3 uniq relation 2012-12-04 00:31:46 +08:00
Rueshyna 9759a32394 can display relation between author 2012-12-04 00:31:46 +08:00
Rueshyna f89a6194c4 add back button 2012-12-04 00:31:46 +08:00
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
Rueshyna 0affc73370 modify delete co-author message 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 b1ddc9950a adjust update password textfield position 2012-12-04 00:31:06 +08:00
Rueshyna 184f903b1c correct user passwd and sent json to front-end 2012-12-04 00:31:06 +08:00
Rueshyna 8a7ae3f061 correct user passwd and sent json to front-end 2012-12-04 00:31:06 +08:00
Rueshyna eb97d417bd if coauthor not in coauthor db then it will be add in db 2012-12-04 00:31:06 +08:00
Rueshyna 7f7b33f310 fixed journal update method 2012-12-04 00:31:06 +08:00
Harry Bomrah ee830f148e jumping menus updated.. 2012-12-04 00:30:10 +08:00
Rueshyna 6426fb74d9 remove edit page cancel buttom 2012-12-04 00:25:58 +08:00