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 |
|
devin
|
be850ce0be
|
minor update for gallery and calendar backend
|
2012-11-20 18:04:23 +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 |
|
chris
|
7416020161
|
Add force_order_for_user for ad_images
|
2012-11-20 14:24:49 +08:00 |
|
chris
|
c8bbb28d42
|
Fix wrong alias in design.rb for themes
|
2012-11-20 12:46:50 +08:00 |
|
chris
|
84c284fa71
|
Fix wrong naming in theme.rb
|
2012-11-20 12:42:53 +08:00 |
|
chris
|
dcd781b36b
|
Restore "force_order_for_user" for ad_banner
|
2012-11-20 12:38:35 +08:00 |
|
chris
|
df58d4c5f3
|
Merge branch 'modified_json_format' of github.com:Rulingcom/orbit into modified_json_format
Conflicts:
vendor/built_in_modules/gallery/config/routes.rb
|
2012-11-20 12:14:53 +08:00 |
|
Rueshyna
|
bb63e68ee7
|
rm redundant file ...
|
2012-11-20 12:13:18 +08:00 |
|
Rueshyna
|
47075944e7
|
make gallery json format to two layer
|
2012-11-20 12:13:18 +08:00 |
|
Rueshyna
|
81f67fc08a
|
make announcement json format to two layer
|
2012-11-20 12:11:35 +08:00 |
|
Rueshyna
|
bfef1a8e7c
|
tmp
|
2012-11-20 12:11:35 +08:00 |
|
Rueshyna
|
bd7518093f
|
about route url link bug
|
2012-11-20 12:11:35 +08:00 |
|
Rueshyna
|
310d7523bd
|
modified gallery json format but it have some bugs...
|
2012-11-20 12:11:35 +08:00 |
|
Rueshyna
|
36b4cb1ec1
|
modified announcement json format but it have some bugs...
|
2012-11-20 12:09:58 +08:00 |
|
chris
|
c1da80761e
|
Remove wrong mongo port
|
2012-11-20 12:04:34 +08:00 |
|
chris
|
3beed406a7
|
Fix Nokogiri when '.first' returns nothing
|
2012-11-20 12:00:18 +08:00 |
|
chris
|
747b0d4620
|
Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
Conflicts:
vendor/built_in_modules/gallery/config/routes.rb
|
2012-11-20 10:11:59 +08:00 |
|
chris
|
1a76d5d3cb
|
Merge branch 'new' of github.com:Rulingcom/orbit into new
|
2012-11-20 10:10:16 +08:00 |
|
chris
|
192e52b5de
|
Remove middle site
|
2012-11-20 10:06:07 +08:00 |
|
chris
|
609c932cca
|
Fix some gallery routes
|
2012-11-20 10:05:56 +08:00 |
|
chris
|
d61621e198
|
Remove some pry and add address code
|
2012-11-20 10:05:38 +08:00 |
|
chris
|
6789d44431
|
Fix design edit
|
2012-11-20 10:04:50 +08:00 |
|
chris
|
05081c1a5c
|
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
Conflicts:
app/helpers/attribute_fields_helper.rb
|
2012-11-20 09:56:28 +08:00 |
|
Matthew K. Fu JuYuan
|
2aa9a19deb
|
complete address field. still have javascript issue for fill back and display address ext fields in modal.
|
2012-11-20 09:53:37 +08:00 |
|
Matthew K. Fu JuYuan
|
17988f2fb2
|
address field and text field convert
|
2012-11-20 09:53:37 +08:00 |
|
Matthew K. Fu JuYuan
|
a85e5fcc0d
|
address field. js and style is broken
|
2012-11-20 09:53:36 +08:00 |
|
Matthew K. Fu JuYuan
|
be448d42c9
|
add_more ok
|
2012-11-20 09:52:50 +08:00 |
|
Harry Bomrah
|
04469ff845
|
Minor update for gallery frontend
|
2012-11-19 18:18:46 +08:00 |
|
Rueshyna
|
398432d0fc
|
some bugs
|
2012-11-19 16:28:05 +08:00 |
|
Rueshyna
|
db3797694b
|
change journal list json link
|
2012-11-19 12:13:05 +08:00 |
|
Rueshyna
|
8abb20b4c8
|
add edit function
|
2012-11-19 12:07:24 +08:00 |
|
Rueshyna
|
9501bf2df3
|
midify checkbox value
|
2012-11-18 14:15:00 +08:00 |
|
Rueshyna
|
26436395f5
|
finished some method of list and journal
|
2012-11-18 03:07:50 +08:00 |
|
Rueshyna
|
024b331cf3
|
split form from add.html.erb
|
2012-11-16 16:02:17 +08:00 |
|
Matthew K. Fu JuYuan
|
b4a2737407
|
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
Conflicts:
app/helpers/attribute_fields_helper.rb
app/views/admin/infos/_form.html.erb
config/locales/zh_tw.yml
|
2012-11-16 15:42:39 +08:00 |
|
Matthew K. Fu JuYuan
|
3034e53423
|
complete address field. still have javascript issue for fill back and display address ext fields in modal.
|
2012-11-16 15:36:08 +08:00 |
|
Rueshyna
|
e60480a4be
|
add.html convert to add.html.erb done
|
2012-11-16 15:33:31 +08:00 |
|
Rueshyna
|
b51397d2e2
|
convert html template to html.erb
|
2012-11-16 12:54:21 +08:00 |
|
Rueshyna
|
c85b15e425
|
rm binding.pre ...
|
2012-11-16 09:44:57 +08:00 |
|
Rueshyna
|
34f0eea1ff
|
add more fake data
|
2012-11-16 09:13:51 +08:00 |
|
Rueshyna
|
b998b8f346
|
make it real
|
2012-11-16 01:54:10 +08:00 |