Matthew K. Fu JuYuan
|
ec0ec46303
|
visitor now can browse gallery
|
2012-11-21 18:39:28 +08:00 |
chris
|
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 |
Harry Bomrah
|
73e76f2477
|
routes fixed
|
2012-11-21 18:36:56 +08:00 |
|
Harry Bomrah
|
c53581c999
|
small fix for journal_pages desktop
|
2012-11-21 18:36:56 +08:00 |
|
Harry Bomrah
|
0b9af044ba
|
new file created for journal pages
|
2012-11-21 18:36:56 +08:00 |
Rueshyna
|
b47be52309
|
tmp
|
2012-11-21 18:36:56 +08:00 |
|
Rueshyna
|
d502f561ef
|
add co-author db and curd page, but it can't destory it...
|
2012-11-21 18:36:32 +08:00 |
|
Rueshyna
|
6a9426c9c8
|
add co-author page and new it, but can't destory it...
|
2012-11-21 18:36:32 +08:00 |
|
Rueshyna
|
5006cd2f61
|
done add journals function
|
2012-11-21 18:34:03 +08:00 |
|
chris
|
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 |
|
Matthew K. Fu JuYuan
|
1279af0c11
|
fix and hide for visitors,except for album
|
2012-11-21 18:31:57 +08:00 |
|
Matthew K. Fu JuYuan
|
1f8f58e930
|
album and gallery is now opened
|
2012-11-21 17:52:25 +08:00 |
|
Harry Bomrah
|
91005bb00a
|
routes fixed
|
2012-11-21 17:39:01 +08:00 |
|
Harry Bomrah
|
c94940214c
|
small fix for journal_pages desktop
|
2012-11-21 17:11:18 +08:00 |
|
Harry Bomrah
|
ef3fddd863
|
fixed sutpid bug for calendar
|
2012-11-21 16:55:18 +08:00 |
|
Harry Bomrah
|
b571373c8f
|
new file created for journal pages
|
2012-11-21 15:35:23 +08:00 |
|
Harry Bomrah
|
9fc8ec8e16
|
back button fix for frontend
|
2012-11-21 15:00:07 +08:00 |
|
Rueshyna
|
5c0b137c6d
|
tmp
|
2012-11-21 14:52:26 +08:00 |
|
Matthew K. Fu JuYuan
|
fda7c43efc
|
Merge branch 'master' of github.com:Rulingcom/orbit into openness
|
2012-11-21 11:46:44 +08:00 |
|
Matthew K. Fu JuYuan
|
ee053cd8ac
|
fix and hide for visitors,except for album
|
2012-11-21 11:46:06 +08:00 |
|
Rueshyna
|
da1b871481
|
merge
|
2012-11-21 10:46:33 +08:00 |
|
chris
|
4966537491
|
Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP
|
2012-11-21 07:38:10 +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
|
703324063e
|
change journal list json link
|
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
|
1c6badfb10
|
add more fake data
|
2012-11-21 07:37:43 +08:00 |
|
Rueshyna
|
b6004958c9
|
make it real
|
2012-11-21 07:37:43 +08:00 |
|
Rueshyna
|
bf4c75fcdc
|
add new function
|
2012-11-21 07:37:43 +08:00 |
|
Rueshyna
|
fd3fa19573
|
add fake data, execute by rake db:seed
|
2012-11-21 07:37:42 +08:00 |
|
Rueshyna
|
f93d019ba0
|
check file type
|
2012-11-21 07:37:42 +08:00 |
|
Rueshyna
|
61c0c4b542
|
modified file of view bug
|
2012-11-21 07:37:42 +08:00 |
|
Harry Bomrah
|
97ffb5ff18
|
file view update
|
2012-11-21 07:37:42 +08:00 |
|
Rueshyna
|
02643c12bf
|
modified getjournals format
|
2012-11-21 07:37:41 +08:00 |
|
Rueshyna
|
5643b0a528
|
delete demo db of journal and paper
|
2012-11-21 07:37:41 +08:00 |
|
Rueshyna
|
4ce10d2fd9
|
make a json format for view of journal_p
|
2012-11-21 07:37:41 +08:00 |
|
chris
|
048e8dd7ab
|
Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
|
2012-11-21 07:37:20 +08:00 |
devin
|
f2e76d27b8
|
minor update for gallery and calendar backend
|
2012-11-21 07:36:59 +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 |
|
Matthew K. Fu JuYuan
|
96fe482d50
|
for openness
|
2012-11-20 20:20:59 +08:00 |
|
devin
|
1c0fd0e199
|
minor update for gallery and calendar backend
|
2012-11-20 18:16:45 +08:00 |
|
Harry Bomrah
|
0ef76f9200
|
Desktop updates various
|
2012-11-20 17:20:05 +08:00 |
|
chris
|
6273300c28
|
Fix for ad_image
|
2012-11-20 15:47:07 +08:00 |
|
Rueshyna
|
95a3831dce
|
done add journals function
|
2012-11-20 14:58:15 +08:00 |