Joshua Milton
|
3f42a22094
|
Books section added
|
2012-07-04 17:55:30 +08:00 |
Harry Bomrah
|
32d1f8840c
|
Merge branch 'desktop_harry' into desktop_joshua
|
2012-06-26 21:11:19 +08:00 |
|
Harry Bomrah
|
4aa155a44d
|
timeline updates major ones..
|
2012-06-26 21:09:33 +08:00 |
|
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 |
|
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 |
|
Harry Bomrah
|
7488341836
|
Commit for app window..
|
2012-05-25 15:41:07 +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 |
|
Harry Bomrah
|
75cbae049b
|
few experiments…
|
2012-05-16 11:18:54 +08:00 |
|
Harry Bomrah
|
1a9fa8f505
|
Merge branch 'desktop_harry' into desktop_devin
|
2012-05-11 15:28:05 +08:00 |
|
Harry Bomrah
|
2c3637e9b4
|
very important update for widgets management..
|
2012-05-11 15:27:16 +08:00 |
|
devin
|
97b60c48b2
|
update
|
2012-05-10 17:41:56 +08:00 |
|
devin
|
ada56a7a63
|
some update
|
2012-05-10 10:54:43 +08:00 |
|
Harry Bomrah
|
2083e0bf4f
|
widget structure improvised…
|
2012-05-07 19:00:50 +08:00 |
|
Harry Bomrah
|
fcc875bb5d
|
app store page added… and few other changes..
|
2012-05-04 20:28:12 +08:00 |
|
Harry Bomrah
|
4dc82e91a0
|
Merge branch 'desktop_devin' into desktop_harry
|
2012-05-03 21:41:20 +08:00 |
|
Harry Bomrah
|
49ab5bd858
|
minor update
|
2012-05-03 21:40:40 +08:00 |
|
Harry Bomrah
|
3ad11f2098
|
View functionality, changed controller, journal and pages collections
|
2012-05-03 21:38:03 +08:00 |
|
Harry Bomrah
|
a3a1e4b92e
|
controller change, views working and db for paper and journals
|
2012-05-03 21:30:12 +08:00 |
|
devin
|
aeaf2f05d1
|
Start Add Page - no function
|
2012-05-03 17:59:07 +08:00 |
|
Harry Bomrah
|
1fce99c96f
|
Merge branch 'desktop_harry' into desktop_devin
|
2012-05-03 14:42:07 +08:00 |
|
Harry Bomrah
|
d6cbbff9de
|
connection page working now..
|
2012-05-03 14:40:54 +08:00 |
|
devin
|
b87cf0e2ff
|
list page
|
2012-05-03 14:39:22 +08:00 |
|
Harry Bomrah
|
6b8c79a9a8
|
Merge branch 'desktop_devin' into desktop_harry
|
2012-05-02 17:06:56 +08:00 |
|
Harry Bomrah
|
5b7c422446
|
position update fixed..
|
2012-05-02 17:05:40 +08:00 |
|
devin
|
887bda1491
|
lots of change
|
2012-05-02 17:04:16 +08:00 |
|
devin
|
bfc4507696
|
Connection page design
|
2012-05-01 18:05:17 +08:00 |
|
Harry Bomrah
|
769a67f026
|
the group more structured and also demo connecting with gmail account..
|
2012-04-30 21:17:20 +08:00 |
|
Harry Bomrah
|
1b7fb106f8
|
lot of updates
|
2012-04-30 14:33:12 +08:00 |
|
Harry Bomrah
|
aacd9da9fb
|
auto login encryption done…
|
2012-04-30 14:29:42 +08:00 |
|
devin
|
b6fceadff4
|
column group experiment
|
2012-04-30 06:41:05 +08:00 |
|
devin
|
a99d685bce
|
conflict solved
|
2012-04-28 01:56:00 +08:00 |
|
devin
|
03f19b80b4
|
small change
|
2012-04-28 01:49:48 +08:00 |
|
Harry Bomrah
|
a23f290831
|
changes for login …
|
2012-04-27 22:14:44 +08:00 |
|
devin
|
2ebba577eb
|
journal start
|
2012-04-27 14:04:11 +08:00 |
|
devin
|
682880c5bf
|
skip it
|
2012-04-26 23:18:52 +08:00 |
|
Harry Bomrah
|
c158375d02
|
with connection and some save settings…
|
2012-04-26 21:30:13 +08:00 |
|
Harry Bomrah
|
c2ac682787
|
updates for connections
|
2012-04-26 17:23:47 +08:00 |
|
Harry Bomrah
|
64be61d61b
|
with gmail widget..
|
2012-04-26 14:47:49 +08:00 |
|
Harry Bomrah
|
a298cbd5f6
|
Publication started
|
2012-04-24 16:45:26 +08:00 |
|
Harry Bomrah
|
670ec2a40e
|
Themes from db fixed..
|
2012-04-23 21:04:02 +08:00 |
|
Harry Bomrah
|
8c42f6bb7c
|
Merge branch 'desktop_harry' into desktop_devin
|
2012-04-20 14:44:57 +08:00 |
|
devin
|
2ebed9e44a
|
javascript update
|
2012-04-20 09:45:40 +08:00 |
|
devin
|
1f077cf2b3
|
javascript update
|
2012-04-20 07:31:48 +08:00 |
|
devin
|
19750d69e0
|
some update
|
2012-04-20 05:38:53 +08:00 |