Commit Graph

569 Commits

Author SHA1 Message Date
Fu Matthew 979df9ac80 daily commit 2013-01-23 18:51:18 +08:00
Fu Matthew 0cc616f988 page can use default widget 2013-01-21 16:56:37 +08:00
Fu Matthew e1e003af6e Complete new interface 2013-01-14 19:18:25 +08:00
unknown 504f5027cc member role edit 2013-01-14 19:00:08 +08:00
Rueshyna bf31d0c3dd modularized personal journal 2013-01-14 17:54:52 +08:00
Rueshyna 758cab5ecd move journal code to persional_journal modulaar 2013-01-14 17:53:59 +08:00
Rueshyna 284bf34fec amend file value to correct format 2013-01-14 17:53:59 +08:00
chris 282604d1fa Merge branch 'back' of github.com:Rulingcom/orbit into back
Conflicts:
	app/assets/javascripts/mobile/orbit.mobile.js.erb
	app/assets/stylesheets/mobile.css
	app/assets/stylesheets/mobile/orbit-mobile.css.erb
	app/controllers/application_controller.rb
	app/controllers/mobile_controller.rb
	app/views/layouts/mobile.mobile.erb
	app/views/mobile/_footer.mobile.erb
	app/views/mobile/_header.mobile.erb
	app/views/mobile/_menu.mobile.erb
	app/views/mobile/index.mobile.erb
	config/routes.rb
2013-01-14 17:46:27 +08:00
unknown 84e4a558be member roles edit 2013-01-14 17:02:51 +08:00
chris 4e2cbac027 Remove bottom padding if no footer in mobile
Add a method in routes
Copy mobile routes under the scope 'app' for app usage
2013-01-11 19:14:48 +08:00
Fu Matthew b950ad64c0 fix for fronted editing not responding for announcement. 2013-01-10 18:17:27 +08:00
Rueshyna 08adb887c5 change *default* to *defulat* 2013-01-10 09:40:52 +08:00
chris 41dff814fb Change icons 2013-01-09 21:17:50 +08:00
Fu Matthew 5ab4bbd367 add ad_banner inner page,pic title. 2013-01-09 16:54:33 +08:00
chris 1d80b39dcb Fix no responding when trying to access front end page 2013-01-09 11:23:18 +08:00
chris fac4faad6c Change date picker 2013-01-09 05:18:16 +08:00
Fu Matthew 7594e1b9a6 fix member has no module_app 2013-01-07 17:20:37 +08:00
Fu Matthew 5793f0fe5d default widget link.
make sure to run
rake migrate:make_default_widget_work_config
for changing announcement module app
2013-01-07 17:20:37 +08:00
chris 6c6bda988d Add mobile version in site settings 2013-01-07 03:57:36 +08:00
chris 37740adb24 Add mobile but remove news in it 2013-01-07 03:03:38 +08:00
chris c6111460f5 Fix album widget options 2013-01-07 00:40:43 +08:00
Rueshyna 3e8b029c5f change bulletin object to bulletin title 2013-01-04 10:50:08 +08:00
Fu Matthew 39f715319b Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu
Conflicts:
	lib/tasks/migrate.rake
2013-01-03 19:41:52 +08:00
Fu Matthew a70110f787 make default widget works without init 2013-01-03 19:38:14 +08:00
chris 5b289bc1d2 Fix old tags 2013-01-03 19:15:08 +08:00
Fu Matthew 1856d2395d complete page error handler logic 2013-01-03 15:35:14 +08:00
Fu Matthew 6da528ef98 show error message when trying to show a not existed page 2013-01-03 13:50:27 +08:00
Fu Matthew 5d6279a9ea fix calendar broken 2013-01-03 10:58:52 +08:00
Fu Matthew 2c632551e5 fix preview filed after ad_banner created. 2013-01-02 17:51:53 +08:00
Fu Matthew 32c6f17613 fix object auth. show error message if user try to do object auth in a wrong way. 2013-01-02 14:34:34 +08:00
Fu Matthew 5587e83419 Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu 2012-12-28 15:31:32 +08:00
Fu Matthew baf1240b76 gallery options 2012-12-28 15:30:46 +08:00
chris 37309a452d Fix site map and menu order 2012-12-28 11:37:37 +08:00
Fu Matthew cfb65dd056 Preventing site default design being deleted. 2012-12-27 10:26:27 +08:00
chris 3a9106c10d Add mobile but remove news in it 2012-12-20 03:21:50 +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
chris fcbba6660b Only one parser for front end
Separate site map for i18n
2012-12-19 17:15:31 +08:00
Harry Bomrah 9dde79414d all sections and sections megerd 2012-12-07 12:38:23 +08:00
chris ff435a4af4 Change the design for the whole site form designs index 2012-12-07 12:14:31 +08:00
chris c74ead8318 Redirect to designs after buying template
Randomise buy counts
2012-12-07 09:07:49 +08:00
Rueshyna 39b5959de7 fixed bug about co-author-relation 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
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
Rueshyna b89e371393 can update co-author relation 2012-12-06 07:59:43 +08:00
Rueshyna e7fdac1d23 make coauthor relation can be edit 2012-12-06 07:59:43 +08:00