Fu Matthew
|
39f715319b
|
Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu
Conflicts:
lib/tasks/migrate.rake
|
2013-01-03 19:41:52 +08:00 |
|
Fu Matthew
|
a70110f787
|
make default widget works without init
|
2013-01-03 19:38:14 +08:00 |
chris
|
5b289bc1d2
|
Fix old tags
|
2013-01-03 19:15:08 +08:00 |
|
Fu Matthew
|
1856d2395d
|
complete page error handler logic
|
2013-01-03 15:35:14 +08:00 |
|
Fu Matthew
|
6da528ef98
|
show error message when trying to show a not existed page
|
2013-01-03 13:50:27 +08:00 |
|
Fu Matthew
|
5d6279a9ea
|
fix calendar broken
|
2013-01-03 10:58:52 +08:00 |
|
Fu Matthew
|
2c632551e5
|
fix preview filed after ad_banner created.
|
2013-01-02 17:51:53 +08:00 |
|
Fu Matthew
|
32c6f17613
|
fix object auth. show error message if user try to do object auth in a wrong way.
|
2013-01-02 14:34:34 +08:00 |
|
Fu Matthew
|
5587e83419
|
Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu
|
2012-12-28 15:31:32 +08:00 |
|
Fu Matthew
|
baf1240b76
|
gallery options
|
2012-12-28 15:30:46 +08:00 |
|
chris
|
37309a452d
|
Fix site map and menu order
|
2012-12-28 11:37:37 +08:00 |
|
Fu Matthew
|
cfb65dd056
|
Preventing site default design being deleted.
|
2012-12-27 10:26:27 +08:00 |
Rueshyna
|
b4633a2ccb
|
.not_guest_user
|
2012-12-19 19:48:13 +08:00 |
|
Rueshyna
|
3d39c2c3c3
|
hidden guest user
|
2012-12-19 19:48:13 +08:00 |
|
chris
|
fcbba6660b
|
Only one parser for front end
Separate site map for i18n
|
2012-12-19 17:15:31 +08:00 |
 Harry Bomrah
|
9dde79414d
|
all sections and sections megerd
|
2012-12-07 12:38:23 +08:00 |
|
chris
|
ff435a4af4
|
Change the design for the whole site form designs index
|
2012-12-07 12:14:31 +08:00 |
|
chris
|
c74ead8318
|
Redirect to designs after buying template
Randomise buy counts
|
2012-12-07 09:07:49 +08:00 |
|
Rueshyna
|
39b5959de7
|
fixed bug about co-author-relation
|
2012-12-07 04:21:26 +08:00 |
|
chris
|
af381e75de
|
Add images to store
|
2012-12-07 02:37:05 +08:00 |
|
chris
|
6f1748d2b3
|
- template list/show is loaded from central server
- buy a template downloads and creates it in DB
- changes in designs index
|
2012-12-06 23:20:27 +08:00 |
|
Harry Bomrah
|
3d1fb48489
|
edit coauthor relation done
|
2012-12-06 07:59:44 +08:00 |
|
Rueshyna
|
4681f0ee36
|
sort co_author name
|
2012-12-06 07:59:44 +08:00 |
|
Rueshyna
|
6d08ca996f
|
add back buton in relation page
|
2012-12-06 07:59:44 +08:00 |
|
Rueshyna
|
b4a99e58cf
|
sort author email
|
2012-12-06 07:59:44 +08:00 |
|
Rueshyna
|
b89e371393
|
can update co-author relation
|
2012-12-06 07:59:43 +08:00 |
|
Rueshyna
|
e7fdac1d23
|
make coauthor relation can be edit
|
2012-12-06 07:59:43 +08:00 |
|
Rueshyna
|
4ae7ac8388
|
clean route table about desktop
|
2012-12-06 07:59:42 +08:00 |
|
Rueshyna
|
05027afa63
|
make journal list easy to read
|
2012-12-06 07:59:42 +08:00 |
|
Rueshyna
|
4f31b1362b
|
fixed new co-author relation bug....
|
2012-12-06 07:59:42 +08:00 |
|
Rueshyna
|
1289ad9f9d
|
fixed co-author relation bug....
|
2012-12-06 07:59:42 +08:00 |
|
Rueshyna
|
afd8e7e380
|
when delete co-author relation, the co-author will be reset nil
|
2012-12-06 07:59:42 +08:00 |
unknown
|
7d3c535e01
|
add info field
|
2012-12-06 07:58:39 +08:00 |
|
Rueshyna
|
9759a32394
|
can display relation between author
|
2012-12-04 00:31:46 +08:00 |
|
Harry Bomrah
|
49d1ca6997
|
new type fixed
|
2012-12-04 00:31:46 +08:00 |
|
Rueshyna
|
e143f9a345
|
can select relection from relation db
|
2012-12-04 00:31:46 +08:00 |
|
Rueshyna
|
0affc73370
|
modify delete co-author message
|
2012-12-04 00:31:07 +08:00 |
|
Rueshyna
|
7822ffc33d
|
can add relation between co-author
|
2012-12-04 00:31:06 +08:00 |
|
Rueshyna
|
5dabfe9319
|
refine co-authro page
|
2012-12-04 00:31:06 +08:00 |
|
Rueshyna
|
5986817e16
|
add journal_list. now, those pair, (journal_title, journal_levels), is uniq
|
2012-12-04 00:31:06 +08:00 |
|
Rueshyna
|
184f903b1c
|
correct user passwd and sent json to front-end
|
2012-12-04 00:31:06 +08:00 |
|
Rueshyna
|
7f7b33f310
|
fixed journal update method
|
2012-12-04 00:31:06 +08:00 |
|
Harry Bomrah
|
ee830f148e
|
jumping menus updated..
|
2012-12-04 00:30:10 +08:00 |
|
Rueshyna
|
5a9d9151d9
|
add journal list template
|
2012-12-04 00:25:58 +08:00 |
|
chris
|
dc3be3c9a1
|
Translation changes
|
2012-12-03 23:00:04 +08:00 |
|
chris
|
036d7bbb0e
|
Module store
|
2012-11-29 02:02:37 +08:00 |
|
chris
|
06335f9bd1
|
Joshua's html
|
2012-11-29 00:59:46 +08:00 |
|
Rueshyna
|
0125010a05
|
modified error msgs and cancle button, but those two have bug...
|
2012-11-26 15:45:51 +08:00 |
|
Rueshyna
|
065d38c797
|
add autocomplete js
|
2012-11-26 14:44:35 +08:00 |
|
unknown
|
8a79d7ff2e
|
member selects
|
2012-11-26 10:25:34 +08:00 |