5913f73850
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
2012-10-15 14:09:58 +08:00
31b583228d
fixed html for add link. form html
2012-10-15 14:07:53 +08:00
334e5b464c
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
2012-10-15 13:56:16 +08:00
7901de7b31
can add member
2012-10-15 13:54:29 +08:00
c511600cad
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
2012-10-15 12:35:27 +08:00
9027562450
new code for attribute fields and values for new member interface
2012-10-15 12:35:07 +08:00
b5571dbc43
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
...
Conflicts:
app/controllers/admin/users_new_interface_controller.rb
app/views/admin/users_new_interface/show.html.erb
2012-10-12 18:17:05 +08:00
1ce7f00084
new code for attribute fields and values for new member interface
2012-10-12 18:09:02 +08:00
189fa553c5
Changes for helpers, not including all by default
2012-10-09 14:47:16 +08:00
9e2bc7e1c1
Ray's changes in css and js
2012-10-09 07:48:05 +08:00
d2fea92969
GPRS and CALENDAR
2012-10-09 06:42:00 +08:00
9f825de288
user new interface 70%
2012-10-09 06:40:18 +08:00
1aacf5e2ce
user status method. Now the sub_role shall be sat with it's status in order to record sub_role status into user object.
...
Sub_role can be removed normally and the method check_status_record will make sure data is being saved as it should be.
Also unnecessary role will be removed if no sub role exists.
2012-10-09 06:40:18 +08:00
e16a27601d
user new interface 70%
2012-10-08 16:58:33 +08:00
fb3364b28e
Merge commit '975523c8b2d886805a3622e3ef23b2f398722d45' into app_config
2012-09-24 14:14:13 +08:00
975523c8b2
demo site plugin
2012-09-24 14:10:44 +08:00
3a65f599e6
first version app config for Spen durning Chris's leave.
2012-09-24 11:43:48 +08:00
5de433d219
user status method. Now the sub_role shall be sat with it's status in order to record sub_role status into user object.
...
Sub_role can be removed normally and the method check_status_record will make sure data is being saved as it should be.
Also unnecessary role will be removed if no sub role exists.
2012-09-18 16:22:56 +08:00
0907324a2f
add member link to orbit menu
2012-09-17 14:18:27 +08:00
228fa0fca3
Remove setting from side bar
2012-09-17 13:40:14 +08:00
19db9d0037
basic function
2012-09-17 13:32:52 +08:00
9eed9ec7b6
demo site plugin
2012-09-17 13:32:52 +08:00
b09b1cf2f5
commit for calendar
2012-09-14 21:59:20 +08:00
af19f11668
calendar update
...
- delete unwanted style in bootstrap-responsive.css
- yet start repeat panel
- please just refer how google works (functionality)
2012-09-14 15:57:44 +08:00
0e507d549d
some more changes
2012-09-14 15:32:15 +08:00
3d9fb548e1
calendar fixed
2012-09-14 15:20:01 +08:00
ee51240102
Ray's changes for new backend
2012-09-14 02:38:56 +08:00
194773f064
Fix bugs after merge
2012-09-14 02:27:49 +08:00
42d50ae534
Plugins
2012-09-14 00:05:31 +08:00
03b5827392
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
...
Conflicts:
app/controllers/application_controller.rb
app/views/layouts/_side_bar.html.erb
2012-09-14 00:03:52 +08:00
5fb94f644d
break down Ray's HTML
2012-09-14 00:02:22 +08:00
3e5978c8fd
users new interface controller
2012-09-14 00:02:21 +08:00
4818e3f444
first version for new member html
2012-09-14 00:02:21 +08:00
29ea95b4c6
event_calendar testing
2012-09-13 23:57:47 +08:00
9bfd1d2b0c
break down Ray's HTML
2012-09-13 18:39:27 +08:00
2e9af5d1a8
fix commit bugs
2012-09-13 15:53:36 +08:00
f88176ee1f
Merge branch 'gallery_orbit' of https://github.com/Rulingcom/orbit into gallery_orbit
2012-09-12 16:48:33 +08:00
3432d1359b
Fix bug in show_from_link
2012-09-12 16:46:03 +08:00
17195a9a23
fix for admin has no orbit menu
2012-09-12 16:20:15 +08:00
98e8f5f607
complete visitor dashbroad
2012-09-12 16:20:15 +08:00
803f83b239
fix for no login window for backend
2012-09-12 16:20:15 +08:00
45ef7fd302
guest user
2012-09-12 16:20:15 +08:00
17f3104c8d
Merge branch 'gallery_orbit' into desktop_devin
2012-09-12 16:18:13 +08:00
e96ebefe9c
calendar update
2012-09-12 16:16:01 +08:00
905541aa38
Ray's tp CSS changes
2012-09-12 03:50:20 +08:00
816b542ca6
Change side bar to use key instead of title for ModuleApps
2012-09-12 03:07:25 +08:00
e88b09cf72
Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
...
Conflicts:
app/controllers/pages_controller.rb
app/views/layouts/_side_bar.html.erb
lib/parsers/parser_common.rb
vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css
vendor/built_in_modules/gallery/config/locales/en.yml
vendor/built_in_modules/gallery/config/locales/zh_tw.yml
2012-09-12 02:21:18 +08:00
4ea0c0ec9c
minor fix for sidebar
2012-09-12 02:14:50 +08:00
8a71bd530f
page added...
2012-09-12 02:14:50 +08:00
8dd69a140f
frontend commits
2012-09-12 02:12:15 +08:00
chris
Matthew K. Fu JuYuan
OrbitServer
Harry Bomrah
unknown
devin