Christophe Vilayphiou
|
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 |
Harry Bomrah
|
4ea0c0ec9c
|
minor fix for sidebar
|
2012-09-12 02:14:50 +08:00 |
Harry Bomrah
|
8a71bd530f
|
page added...
|
2012-09-12 02:14:50 +08:00 |
Harry Bomrah
|
8dd69a140f
|
frontend commits
|
2012-09-12 02:12:15 +08:00 |
Harry Bomrah
|
3749e919cb
|
front ends updates
|
2012-09-12 02:12:15 +08:00 |
Harry Bomrah
|
a42a651f90
|
frontend updates
|
2012-09-12 02:08:02 +08:00 |
Harry Bomrah
|
199839a42a
|
frontend update
|
2012-09-12 02:08:02 +08:00 |
Harry Bomrah
|
3fc07b9ff1
|
one more modification
|
2012-09-12 02:07:40 +08:00 |
Harry Bomrah
|
2a66b89d33
|
Modifications in ruby
|
2012-09-12 02:07:40 +08:00 |
Harry Bomrah
|
7ae1dcd8e0
|
Calendar Module
|
2012-09-12 02:06:22 +08:00 |
devin
|
a05fff98ac
|
front update
|
2012-09-12 02:05:10 +08:00 |
devin
|
4e662c744a
|
backend update
|
2012-09-12 02:05:10 +08:00 |
Harry Bomrah
|
97923a4d31
|
resize thumbnails
|
2012-09-12 02:05:10 +08:00 |
Harry Bomrah
|
7903d2ae36
|
ruby update for form and edit tagging
|
2012-09-12 02:05:10 +08:00 |
devin
|
789c2df7fd
|
gallery frontend update
|
2012-09-12 02:05:10 +08:00 |
Harry Bomrah
|
8259dee4a3
|
Ruby update
|
2012-09-12 02:05:10 +08:00 |
devin
|
cc6986cb16
|
language fix
|
2012-09-12 02:05:10 +08:00 |
devin
|
0be494c62b
|
front end added
|
2012-09-12 02:05:09 +08:00 |
Harry Bomrah
|
6a23e29f33
|
Ruby structure implementation
|
2012-09-12 02:05:09 +08:00 |
Harry Bomrah
|
26ff2af078
|
View only update
|
2012-09-12 02:04:36 +08:00 |
Harry Bomrah
|
f62eba182e
|
Commit for view only
|
2012-09-12 02:04:36 +08:00 |
Harry Bomrah
|
f4dde67344
|
frontend fixes
|
2012-09-12 02:04:36 +08:00 |
Harry Bomrah
|
8caa798c08
|
frontend updates
|
2012-09-12 02:04:36 +08:00 |
devin
|
29c5126455
|
gallery update
|
2012-09-12 02:04:36 +08:00 |
devin
|
4b6eebba7c
|
gallery update
|
2012-09-12 02:04:08 +08:00 |
devin
|
b6f10951b8
|
gallery update
especially upload panel
|
2012-09-12 02:04:07 +08:00 |
Harry Bomrah
|
6e6d441b26
|
code merged … ui updated
|
2012-09-12 02:03:02 +08:00 |
devin
|
2274df4111
|
gallery update
|
2012-09-12 02:02:29 +08:00 |
devin
|
584d1eb0e0
|
gallery update
|
2012-09-12 02:02:01 +08:00 |
devin
|
ede9727a18
|
gallery update
|
2012-09-12 02:02:00 +08:00 |
devin
|
0e5a305f39
|
gallery update
|
2012-09-12 01:58:23 +08:00 |
devin
|
0c624794d5
|
gallery update
|
2012-09-12 01:58:23 +08:00 |
devin
|
887b2d528d
|
gallery update
especially upload panel
|
2012-09-12 01:58:23 +08:00 |
Harry Bomrah
|
ad431b1d06
|
Minor update
|
2012-09-12 01:58:23 +08:00 |
Harry Bomrah
|
91d45b64da
|
code merged … ui updated
|
2012-09-12 01:58:23 +08:00 |
Harry Bomrah
|
04877b9945
|
design update
|
2012-09-12 01:58:23 +08:00 |
devin
|
17c4b9a1bf
|
gallery update
|
2012-09-12 01:58:22 +08:00 |
devin
|
01eae75ad0
|
gallery update
|
2012-09-12 01:58:22 +08:00 |
devin
|
a2ed9e3350
|
gallery update
|
2012-09-12 01:58:22 +08:00 |
Harry Bomrah
|
c84b6a626e
|
minor fix for sidebar
|
2012-09-11 16:50:42 +08:00 |
Matthew K. Fu JuYuan
|
e486ac5d25
|
complete visitor dashbroad
|
2012-09-11 11:30:58 +08:00 |
Matthew K. Fu JuYuan
|
01a8a9b5b6
|
users new interface controller
|
2012-09-11 10:53:05 +08:00 |
Matthew K. Fu JuYuan
|
42cfe5ac91
|
first version for new member html
|
2012-09-11 10:52:27 +08:00 |
Harry Bomrah
|
7bab8bf8ad
|
page added...
|
2012-09-10 14:44:21 +08:00 |
Harry Bomrah
|
8295286c6e
|
frontend commits
|
2012-09-05 19:08:48 +08:00 |
Harry Bomrah
|
b726c10857
|
front ends updates
|
2012-09-04 21:30:17 +08:00 |
Harry Bomrah
|
a080667615
|
frontend updates
|
2012-09-04 17:17:18 +08:00 |
Harry Bomrah
|
4a12c9d6fb
|
frontend update
|
2012-09-03 21:49:35 +08:00 |
Harry Bomrah
|
202d736a5d
|
one more modification
|
2012-08-31 22:02:06 +08:00 |
Harry Bomrah
|
4d6a9a8e87
|
Modifications in ruby
|
2012-08-31 22:01:19 +08:00 |