 Matt
|
962bae9a82
|
merge
|
2012-10-01 21:09:09 +08:00 |
|
|
Matt
|
b65d785834
|
harry's fix, announcement still broken
|
2012-10-01 17:21:23 +08:00 |
|
|
Matt
|
5f63af4e77
|
fix for search news,needs to applied to announcement,also need to fix some translation
|
2012-09-24 18:10:48 +08:00 |
|
|
Matt
|
79006201cd
|
ad_image date picker fixed
|
2012-09-19 12:23:05 +08:00 |
|
|
Matt
|
71021b8c69
|
Changes for empty file and link in create and edit for news and announcement + partially fix tinymce
|
2012-09-11 00:41:52 +08:00 |
|
|
Matt
|
9d21a86f53
|
Ray's CSS changes for NCCU email
|
2012-09-07 18:16:34 +08:00 |
|
|
Matt
|
1aea8d91f4
|
Merge branch 'master' of github.com:Rulingcom/NCCU
|
2012-08-08 18:16:38 +08:00 |
|
|
Matt
|
62ba8c9f18
|
Fix bugs on 172:180
|
2012-08-08 17:56:00 +08:00 |
|
|
Matt
|
6a022c90da
|
Changes on nccu
|
2012-05-18 15:20:45 +08:00 |
|
|
Matt
|
2c16284f73
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-18 10:51:49 +08:00 |
|
|
Matt
|
746f71dfee
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-18 10:37:40 +08:00 |
|
|
Matt
|
69af2b7b5a
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-17 23:41:54 +08:00 |
|
|
Matt
|
27fd48b730
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-17 23:37:15 +08:00 |
|
|
Matt
|
4153820dba
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-17 19:41:51 +08:00 |
|
|
Matt
|
9e6ea0b8dc
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-17 19:11:22 +08:00 |
|
|
Matt
|
5720de2e55
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-17 18:38:17 +08:00 |
|
|
Matt
|
0d69403f4a
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-17 16:42:07 +08:00 |
|
|
Matt
|
d1d25a12a1
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-17 10:00:35 +08:00 |
|
|
Matt
|
e9dde4cefe
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-17 09:32:57 +08:00 |
|
|
Matt
|
3d08bd48de
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-17 06:47:03 +08:00 |
|
|
Matt
|
d5bb48ef58
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-17 06:33:03 +08:00 |
|
|
Matt
|
f1941f1fc5
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-15 23:09:17 +08:00 |
|
|
Matt
|
f8baa9e26c
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-14 12:44:09 +08:00 |
|
|
Matt
|
852314c17c
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-14 09:32:28 +08:00 |
|
|
Matt
|
b6f3f3d689
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-14 09:08:55 +08:00 |
|
|
Matt
|
0c2a634922
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-14 01:08:23 +08:00 |
|
|
Matt
|
1c77cb5c42
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-10 14:19:55 +08:00 |
|
|
Matt
|
ea79246f83
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-10 10:35:07 +08:00 |
|
|
Matt
|
f9d66687c1
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-10 00:43:43 +08:00 |
|
|
Matt
|
3a563dde8b
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-10 00:35:28 +08:00 |
|
|
Matt
|
cca2b8fd6c
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-09 15:26:03 +08:00 |
|
|
Matt
|
695b779e4b
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-09 15:04:52 +08:00 |
|
|
Matt
|
0bcfac8177
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-09 14:22:09 +08:00 |
|
|
Matt
|
69187df279
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-09 14:00:23 +08:00 |
|
|
Matt
|
e4c41a9310
|
Test version for DB sync schedule job
|
2012-05-09 13:58:19 +08:00 |
|
|
Matt
|
556b279418
|
Remove publi/assets from github
|
2012-04-25 15:20:15 +08:00 |
|
|
Matt
|
e0d3319ea9
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-04-23 17:21:30 +08:00 |
|
|
Matt
|
a8eeaf235f
|
Add Announcement translation
|
2012-04-23 15:28:56 +08:00 |
|
|
Matt
|
b6f64cd8a5
|
Announcement i18n vars
|
2012-04-23 11:29:00 +08:00 |
|
|
Matt Fu
|
1e60acaa11
|
Fact check program completed,Lin checked
|
2012-03-27 19:06:28 +08:00 |
|
|
Matt Fu
|
3ba89ecbcf
|
Fact check program completed,Lin checked
|
2012-03-27 18:54:03 +08:00 |
|
|
Matt Fu
|
34a4e47057
|
Fact check program completed,Lin checked
|
2012-03-22 14:33:59 +08:00 |
|
|
Matt Fu
|
6700114955
|
after merge
|
2012-03-19 10:55:58 +08:00 |
|
|
Matt Fu
|
9c8b0235b0
|
add new files
|
2012-03-19 10:55:58 +08:00 |
|
|
Matt Fu
|
c7a333f990
|
after merge
|
2012-03-16 15:51:59 +08:00 |
|
|
Matt Fu
|
50a9f66269
|
Merge branch 'design_team' of https://github.com/Rulingcom/orbit into announcement_fact_check
|
2012-03-16 15:50:43 +08:00 |
|
|
Matt Fu
|
eb2b4b80b7
|
add new files
|
2012-03-16 15:48:13 +08:00 |
|
|
Matt Fu
|
13b6892f87
|
code for new fact check
|
2012-03-16 11:09:44 +08:00 |
|
|
Matt Fu
|
d5a2de5476
|
LDAP with sync rake task
|
2012-03-06 16:41:06 +08:00 |
|
|
Matt Fu
|
7f05f21930
|
Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap
Conflicts:
config/environments/development.rb
|
2012-03-01 10:13:49 +08:00 |
|
|
Matt Fu
|
cceb785a8d
|
change view and action for announcement ,Lin checked. Also add validation for object_auth make sure for each object,the object will be unique for each action.
|
2012-02-29 18:58:33 +08:00 |
|
|
Matt Fu
|
819f815023
|
for different database for demo
|
2012-02-29 13:15:25 +08:00 |
|
|
Matt Fu
|
9a40ecd1d9
|
Merge branch 'design_team' into ldap for NCCU 0229 demo on Redmine
Conflicts:
app/views/devise/passwords/new.html.erb
app/views/devise/sessions/new.html.erb
|
2012-02-29 13:07:21 +08:00 |
|
|
Matt Fu
|
b84b7bad63
|
ldap config for 0229 nccu demo
|
2012-02-29 12:35:54 +08:00 |
|
|
Matt Fu
|
438dc0ad3d
|
i18n vars for announcement
|
2012-02-29 11:54:48 +08:00 |
|
|
Matt Fu
|
ccb61fc2dd
|
change Search bar
|
2012-02-29 11:29:13 +08:00 |
|
|
Matt Fu
|
b83a783a26
|
Add translation files for Announcement
|
2012-02-29 11:12:34 +08:00 |
|
|
Matt Fu
|
10fd8ce455
|
Change locales for orbit
|
2012-02-29 10:48:15 +08:00 |
|
|
Matt Fu
|
3209f9aa27
|
Complete for 229 check.
|
2012-02-24 19:07:47 +08:00 |
|
|
Matt Fu
|
678f1eabef
|
LDAP connection and modified Devise
|
2012-02-22 14:43:24 +08:00 |
|
|
Matt Fu
|
26cd6951db
|
change view and action for announcement ,Lin checked. Also add validation for object_auth make sure for each object,the object will be unique for each action.
|
2012-02-17 17:50:23 +08:00 |
|
|
Matthew Fu
|
f8d1a1315b
|
fixing duplicate when updating design
|
2011-07-20 17:05:28 +08:00 |
|
|
Matthew Fu
|
e3a50ccf69
|
move design file field to partial
|
2011-07-20 14:04:16 +08:00 |
|
|
Matthew Fu
|
612ed629bc
|
fix design upload
|
2011-07-20 09:58:24 +08:00 |
|
|
Matthew Fu
|
c48a11d9f5
|
Add some JS for design uploading
|
2011-07-19 18:31:53 +08:00 |
|
|
Matthew Fu
|
f73f09ffcf
|
adding files not commited from previous commit
|
2011-07-12 16:02:41 +08:00 |
|
|
Matthew Fu
|
f387139ae1
|
rails 3.1 and designs (with bug)
|
2011-07-12 16:00:57 +08:00 |
|