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
3933c048b0
delete fixed
2012-11-23 13:22:01 +08:00
8009c6aa34
fixed delete function
2012-11-23 12:28:36 +08:00
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
f38f32ac8b
delete update
2012-11-23 10:46:42 +08:00
996a69f595
add co-author json
2012-11-23 10:44:48 +08:00
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
5b39d10ac6
user roles starts
2012-11-22 21:10:35 +08:00
77386f0284
disable data transform when switching attribute field type. new member stable
2012-11-22 21:10:35 +08:00
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
f6d3b4a9e9
correct 'edit' button of journal list
2012-11-22 21:06:31 +08:00
43f6b7b271
make fake data
2012-11-22 21:06:31 +08:00
868d1c2201
fix for json and some other bugs
2012-11-22 21:06:30 +08:00
e29583ed1f
add delete link
2012-11-22 21:06:30 +08:00
78500e0661
fixed add journal and co-author curd problem, but have redirect problem...
2012-11-22 21:06:30 +08:00
c281ae9447
hidden file field, and fixed updated function
2012-11-22 21:06:30 +08:00
6a12aec67c
Fix album images display
2012-11-22 20:01:10 +08:00
cc7907f37a
user roles starts
2012-11-22 18:20:11 +08:00
9189ebffee
correct 'edit' button of journal list
2012-11-22 18:15:07 +08:00
6dff83339a
disable data transform when switching attribute field type. new member stable
2012-11-22 17:49:44 +08:00
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
645f25d446
make fake data
2012-11-22 16:34:20 +08:00
90fd9de5a8
fix for json and some other bugs
2012-11-22 16:31:52 +08:00
e453cfce9c
add delete link
2012-11-22 15:21:43 +08:00
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
9e400e6e6a
fixed add journal and co-author curd problem, but have redirect problem...
2012-11-22 10:49:54 +08:00
39adbb35c1
Remove before_filter for sub_manager in users
2012-11-22 09:37:31 +08:00
475642d375
Remove news and fix default_url in ImageUploader
2012-11-22 09:30:25 +08:00
bb69a059e8
hidden file field, and fixed updated function
2012-11-22 02:37:56 +08:00
0d26f48c9a
Merge branch 'desktop_devin' of github.com:Rulingcom/orbit into desktop_devin
2012-11-21 19:03:10 +08:00
25a9987f13
calendar js minor update
2012-11-21 19:02:54 +08:00
f8692280e5
Merge branch 'openness' of github.com:Rulingcom/orbit into openness
2012-11-21 18:59:53 +08:00
1dc44e34ac
Merge commit 'ef3fddd863dcfe90f2a352206bdef0ff85af53f0' into openness
...
Conflicts:
vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb
2012-11-21 18:45:46 +08:00
2d0e8b37b2
Fix:
...
- Widgets for announcement
- Facebook link
- AdBanner nav
2012-11-21 18:42:14 +08:00
bfa6579aad
Merge branch 'openness' of github.com:Rulingcom/orbit into openness
2012-11-21 18:39:50 +08:00
ec0ec46303
visitor now can browse gallery
2012-11-21 18:39:28 +08:00
6ca52226ba
Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP
...
Conflicts:
app/views/desktop/journal_p.html.erb
2012-11-21 18:38:28 +08:00
73e76f2477
routes fixed
2012-11-21 18:36:56 +08:00
c53581c999
small fix for journal_pages desktop
2012-11-21 18:36:56 +08:00
0b9af044ba
new file created for journal pages
2012-11-21 18:36:56 +08:00
b47be52309
tmp
2012-11-21 18:36:56 +08:00
d502f561ef
add co-author db and curd page, but it can't destory it...
2012-11-21 18:36:32 +08:00
6a9426c9c8
add co-author page and new it, but can't destory it...
2012-11-21 18:36:32 +08:00
f9b5f71930
visitor now can browse gallery
2012-11-21 18:34:15 +08:00
5006cd2f61
done add journals function
2012-11-21 18:34:03 +08:00
0aaadbc82d
Merge branch 'openness' of github.com:Rulingcom/orbit into openness
...
Conflicts:
vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb
2012-11-21 18:33:04 +08:00
1279af0c11
fix and hide for visitors,except for album
2012-11-21 18:31:57 +08:00
1f8f58e930
album and gallery is now opened
2012-11-21 17:52:25 +08:00
262df57298
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 :
routes fixed
2012-11-21 17:48:03 +08:00
91005bb00a
routes fixed
2012-11-21 17:39:01 +08:00
chris
Harry Bomrah
Rueshyna
Matthew K. Fu JuYuan
devin