Harry Bomrah
|
e8c3a1b904
|
Joshua branch update
|
2012-06-26 17:04:50 +08:00 |
Joshua Milton
|
8c7a0fdf0a
|
test
|
2012-06-26 16:59:29 +08:00 |
|
Harry Bomrah
|
555ec86403
|
Timeline commit
|
2012-06-26 15:59:28 +08:00 |
unknown
|
9aea2824b9
|
demo
|
2012-06-26 14:42:18 +08:00 |
|
unknown
|
0c48664af0
|
demo
|
2012-06-26 14:31:29 +08:00 |
|
unknown
|
db571d2c65
|
demo website widget
|
2012-06-25 15:38:32 +08:00 |
|
Harry Bomrah
|
7f0267aedd
|
have both sinatra and rails running.. just change the routes to use rails or sinatra.. tried using a lot of gems but failed to use devise variables
|
2012-06-04 18:00:06 +08:00 |
Christophe Vilayphiou
|
c1c9cca952
|
Merge branch '0522_nccu_emg' of github.com:Rulingcom/orbit into 0522_nccu_emg
|
2012-05-29 17:19:17 +08:00 |
Matthew K. Fu JuYuan
|
11247ce84c
|
Clean up code , cache other auths. Fix sidebar
|
2012-05-29 17:17:26 +08:00 |
|
Matthew K. Fu JuYuan
|
4d288fb9d1
|
add script for cache user
|
2012-05-29 17:17:26 +08:00 |
|
Matthew K. Fu JuYuan
|
1f1868a75f
|
cache privilege user list.
|
2012-05-29 17:17:26 +08:00 |
|
Harry Bomrah
|
7488341836
|
Commit for app window..
|
2012-05-25 15:41:07 +08:00 |
|
Christophe Vilayphiou
|
75b67dddf5
|
Fix date bugs
|
2012-05-25 09:59:39 +08:00 |
|
Matthew K. Fu JuYuan
|
20eb8b4d15
|
Clean up code , cache other auths. Fix sidebar
|
2012-05-23 13:00:51 +08:00 |
|
Christophe Vilayphiou
|
71d4241a2f
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-05-23 12:11:26 +08:00 |
Christophe Vilayphiou
|
006b84f6a1
|
Ray's fix for ie
|
2012-05-23 12:06:09 +08:00 |
|
Christophe Vilayphiou
|
7c44e94285
|
Order list by created_at desc
Add best image size in news new
|
2012-05-23 11:46:19 +08:00 |
|
Christophe Vilayphiou
|
eab82269c1
|
Remove seconds from date display
|
2012-05-22 20:19:04 +08:00 |
|
Christophe Vilayphiou
|
d6b92fc604
|
Fixed bugs for nccu
|
2012-05-22 20:00:07 +08:00 |
|
Matthew K. Fu JuYuan
|
3e60b34491
|
add script for cache user
|
2012-05-22 17:57:45 +08:00 |
|
Christophe Vilayphiou
|
11a371cbb9
|
Fix destroy in structure
Fix sorting
|
2012-05-22 17:55:45 +08:00 |
|
Matthew K. Fu JuYuan
|
97e289f823
|
cache privilege user list.
|
2012-05-22 17:55:18 +08:00 |
|
Christophe Vilayphiou
|
541aa5831e
|
JS changes to load drag and drop
|
2012-05-22 17:37:15 +08:00 |
|
Christophe Vilayphiou
|
1c35e38097
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-05-22 16:54:35 +08:00 |
|
Christophe Vilayphiou
|
dd4c1697cd
|
Fix bug when object_auth was only built but not created
|
2012-05-22 16:52:12 +08:00 |
|
Christophe Vilayphiou
|
874a89d99b
|
Ray's fix for structure side_bar
|
2012-05-22 16:48:57 +08:00 |
|
Christophe Vilayphiou
|
f497851fe3
|
Merge branch '0522_nccu_emg' of github.com:Rulingcom/orbit into 0522_nccu_emg
|
2012-05-22 16:12:00 +08:00 |
|
Matthew K. Fu JuYuan
|
e0260542d3
|
fix code
|
2012-05-22 16:11:52 +08:00 |
|
Christophe Vilayphiou
|
d0b030c47d
|
Put inc/ajax_setting in new_admin
Fix callback for link on save
|
2012-05-22 16:11:00 +08:00 |
|
Matthew K. Fu JuYuan
|
1bbf89a354
|
fix code
|
2012-05-22 15:54:46 +08:00 |
|
Christophe Vilayphiou
|
ef72a2330c
|
Merge branch '0522_nccu_emg' of github.com:Rulingcom/orbit into 0522_nccu_emg
|
2012-05-22 15:00:37 +08:00 |
|
Matthew K. Fu JuYuan
|
99bcdf6e1e
|
clean up unless code
|
2012-05-22 14:59:54 +08:00 |
|
Matthew K. Fu JuYuan
|
79f67208fa
|
js for preventing user do stupid things durning ajax
|
2012-05-22 14:59:54 +08:00 |
|
Matthew K. Fu JuYuan
|
361722f252
|
fix orbit core to adopt current user behavior
|
2012-05-22 14:59:54 +08:00 |
|
Christophe Vilayphiou
|
70b5654b35
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-05-22 14:47:40 +08:00 |
|
Christophe Vilayphiou
|
5e9836f371
|
Changes for structure
|
2012-05-22 14:45:49 +08:00 |
|
Christophe Vilayphiou
|
27cf99462e
|
Fix bug in page and news
|
2012-05-22 14:42:19 +08:00 |
|
Matthew K. Fu JuYuan
|
7f3b090bb7
|
clean up unless code
|
2012-05-22 13:23:26 +08:00 |
|
Matthew K. Fu JuYuan
|
ae006cc29f
|
js for preventing user do stupid things durning ajax
|
2012-05-22 13:22:24 +08:00 |
|
Matthew K. Fu JuYuan
|
e05cf2a2d6
|
fix orbit core to adopt current user behavior
|
2012-05-22 11:17:50 +08:00 |
|
Christophe Vilayphiou
|
aa114568c4
|
Move design to site_settings side_bar
|
2012-05-21 18:20:39 +08:00 |
|
Christophe Vilayphiou
|
c4d7079059
|
Fix's Matt code for not showing bulletins in index
|
2012-05-21 18:10:03 +08:00 |
devin
|
6fedf7232a
|
app update
|
2012-05-21 15:45:15 +08:00 |
|
Harry Bomrah
|
81ff0f2c1c
|
Merge branch 'desktop_harry' into desktop_devin
|
2012-05-21 15:26:38 +08:00 |
|
devin
|
a78b72ebfc
|
app update
|
2012-05-21 15:25:18 +08:00 |
|
Harry Bomrah
|
dfe7ccf166
|
general commit
|
2012-05-21 15:24:47 +08:00 |
|
devin
|
ab7ae6dcee
|
app
|
2012-05-21 14:55:51 +08:00 |
|
Christophe Vilayphiou
|
815e6a8361
|
Fix matt's code and add it to filters
|
2012-05-19 03:19:55 +08:00 |
|
Christophe Vilayphiou
|
dc4116bc3d
|
Fix page hits count
|
2012-05-19 01:59:17 +08:00 |
|
Christophe Vilayphiou
|
db410b9c50
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-05-18 19:44:18 +08:00 |