3542e58869
Merge branch 'desktop_devin' into desktop_joshua
2012-06-28 17:33:32 +08:00
7151102a86
new page add and timeline changes
2012-06-28 17:31:48 +08:00
32d1f8840c
Merge branch 'desktop_harry' into desktop_joshua
2012-06-26 21:11:19 +08:00
4aa155a44d
timeline updates major ones..
2012-06-26 21:09:33 +08:00
e8c3a1b904
Joshua branch update
2012-06-26 17:04:50 +08:00
8c7a0fdf0a
test
2012-06-26 16:59:29 +08:00
555ec86403
Timeline commit
2012-06-26 15:59:28 +08:00
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
2c3637e9b4
very important update for widgets management..
2012-05-11 15:27:16 +08:00
2083e0bf4f
widget structure improvised…
2012-05-07 19:00:50 +08:00
fcc875bb5d
app store page added… and few other changes..
2012-05-04 20:28:12 +08:00
a3a1e4b92e
controller change, views working and db for paper and journals
2012-05-03 21:30:12 +08:00
d6cbbff9de
connection page working now..
2012-05-03 14:40:54 +08:00
c158375d02
with connection and some save settings…
2012-04-26 21:30:13 +08:00
c2ac682787
updates for connections
2012-04-26 17:23:47 +08:00
64be61d61b
with gmail widget..
2012-04-26 14:47:49 +08:00
a298cbd5f6
Publication started
2012-04-24 16:45:26 +08:00
02c6933d0b
Tiles position saved in db and also change them from section manager
2012-04-17 16:33:41 +08:00
48323ac1af
lot of changes in fetching
2012-04-12 14:44:08 +08:00
25ca29403c
section page added
2012-04-11 17:58:52 +08:00
5a6541a592
Setting page update
2012-04-11 17:26:25 +08:00
4875b339f8
Fetching desktop from db
2012-04-11 15:31:10 +08:00
35567c2139
Widgets Loading dynamically and semi structured
2012-04-06 23:48:03 +08:00
7309d9c446
Dock change and getting values from db
2012-04-06 17:49:22 +08:00
ddf6a606a2
with notifications and other changes
2012-04-06 17:47:03 +08:00
6158799a47
Stupid theme
2012-04-06 17:47:03 +08:00
77b2919d8c
Desktop Commit
2012-04-06 17:47:02 +08:00
8f28d45379
The new AdBanner.
2012-04-02 03:04:38 +08:00
f4fda08e86
Replace PrototypeR4 by Orbit.
...
Move session into mongoid_store.
Reset session when sing_in.
2012-03-16 14:58:32 +08:00
2e58c63ff7
fix bugs with token
2012-02-29 18:56:42 +08:00
cc550c5745
First version for App and Object auth.Taking Announcement as experiment
2012-02-29 18:55:55 +08:00
e0accbecaa
Changes into page_part edition.
...
Can choose between 'text', 'public_r_tag' and 'widget'
2012-02-16 13:09:09 +08:00
3e70634add
Announcement modifications and tags
2012-02-15 00:34:22 +08:00
55ae7de01c
Orbit-bar in front-end and back-end, side-bar and drop-down menu
2012-02-15 00:34:22 +08:00
436f039c1b
build interface to work with object auth. Go to panel/new_blog/back_end/posts/ ,click New Auth link
2012-02-15 00:34:21 +08:00
e20739e32b
Object Auth. Now object can be included with "include OrbitCoreLib::ObjectAuthable" to use kernel method,such as
...
1.Object.authed_for_user(user,title_of_object_auth). title_of_object_auth is optional
2.object.authed_users(user,title_of_object_auth) . title_of_object_auth is optional
if title_of_object_auth is not given,then it will return calculation across all possiblity.
2012-02-15 00:34:21 +08:00
3ed9b81df9
first commit for object auth,will take new_blog for experiment
2012-02-15 00:34:21 +08:00
f097f83f2b
announcement_category edit
2012-02-06 16:20:51 +08:00
3287b68354
Basic function for ad_banner
2012-02-01 14:27:51 +08:00
783eae4597
Change "NewBlog" folders into "new_blog" in assets
...
Modify routes and pages handling for clean front-end urls
2012-01-24 18:16:58 +08:00
afbb9e266a
User role and sub_role simple interface complete
2012-01-24 12:28:33 +08:00
18a82d7f47
Manger and SubManager
2012-01-24 12:28:32 +08:00
62aaf79491
Merge with sub_roles
2011-12-23 18:34:21 +08:00
861237d65b
Integration of Ray' modifications
2011-11-17 20:02:58 +08:00
84ebc8306b
APP zip package placed in lib now can be unzip into vendor
...
APP zip package placed in lib now can be unzip into vendor,however
server can not restart
2011-11-16 15:21:31 +08:00
c1d77fa6d6
Changes for purchases - handle different type of purchases
2011-11-14 10:22:31 +08:00
cb07a35cc9
Revert ff82391b7d0d17c17568ed21176b8b0112a34e31^..HEAD
2011-10-20 10:06:06 +08:00
ff82391b7d
Revert "Merge with new_blog"
...
This reverts commit 64c68fcdeb
2011-10-20 10:01:39 +08:00
64c68fcdeb
Merge with new_blog
2011-10-18 11:36:01 +08:00
9101a2921e
Modifications for image urls
...
Find and replace the urls by the file urls in DB, in the theme files and
layout.html file. Save a copy of those files under "file_orig".
2011-09-01 19:08:45 +08:00
Harry Bomrah
Joshua Milton
Matthew K. Fu JuYuan
Christophe Vilayphiou
Matthew Kaito Juyuan Fu
unknown