maxwell
|
d4f99ca080
|
move search init to search.js, because mobile does not have search to init
|
2011-02-01 22:13:52 -08:00 |
|
zhitomirskiyi
|
21e3c2ae73
|
Merge branch 'open-aspects'
Conflicts:
app/controllers/aspects_controller.rb
app/controllers/home_controller.rb
app/helpers/application_helper.rb
db/migrate/20110201013408_add_open_aspects_to_user.rb
spec/controllers/aspects_controller_spec.rb
spec/controllers/home_controller_spec.rb
|
2011-02-01 17:32:08 -08:00 |
|
zhitomirskiyi
|
7f026e8271
|
now updating the open aspects in js
|
2011-02-01 16:58:33 -08:00 |
|
Raphael
|
06a6cf7fac
|
Adjust autocomplete options and css
|
2011-02-01 15:07:03 -08:00 |
|
Raphael
|
bbe47fbb55
|
Correct limit on search autocomplete
|
2011-02-01 14:35:14 -08:00 |
|
MrZYX
|
15329af94d
|
made "Search for" translatable
|
2011-02-01 21:55:28 +01:00 |
|
Raphael
|
7d18e2bcd8
|
Finish autocomplete
|
2011-02-01 11:56:56 -08:00 |
|
Raphael
|
7be232e33e
|
autocomplete wip
|
2011-02-01 11:56:56 -08:00 |
|
Raphael
|
9080649180
|
Starting work on an autocomplete feature
|
2011-02-01 11:56:56 -08:00 |
|
MrZYX
|
d8f5607509
|
updated locales
|
2011-02-01 16:56:29 +01:00 |
|
Dan Hansen
|
cdb5cf37e7
|
show publisher if it was closed when you select another aspect
|
2011-02-01 00:40:11 -06:00 |
|
Dan Hansen
|
2e03c7f9f6
|
forgot to remove these files from my previous commit
|
2011-01-31 15:23:04 -06:00 |
|
Dan Hansen
|
3746d296b0
|
fix dom traversing for embedder
|
2011-01-31 15:15:30 -06:00 |
|
Dan Hansen
|
0c94660806
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-30 11:43:31 -06:00 |
|
Dan Hansen
|
313f87ebb9
|
make the ajax loader appear in a box
|
2011-01-30 11:43:17 -06:00 |
|
maxwell
|
6dffdd8152
|
don't remove these methods
|
2011-01-29 18:58:34 -08:00 |
|
maxwell
|
348ae0b61d
|
small hack to add some feedback when links are tapped on the mobile site.
|
2011-01-29 18:42:50 -08:00 |
|
Dan Hansen
|
7417dc5923
|
remove debugging statement, fix youtube phrasing
|
2011-01-29 16:41:28 -06:00 |
|
Dan Hansen
|
099e0a6e24
|
i18n is the first widget to be loaded, add video locales, embedder uses i18n, only render mustache template with i18n if the views are passed
|
2011-01-29 16:40:10 -06:00 |
|
Dan Hansen
|
4b1b7591a6
|
load diaspora.js and widgets right after vendor/*, return empty string if the value is not found
|
2011-01-29 16:07:12 -06:00 |
|
Dan Hansen
|
5040a37a31
|
whoops, missed a semicolon
|
2011-01-29 15:59:39 -06:00 |
|
Dan Hansen
|
4484bf33fa
|
fix javascript i18n specs
|
2011-01-29 13:31:45 -08:00 |
|
Dan Hansen
|
b89a59ca55
|
update timeago usages
|
2011-01-29 13:30:32 -08:00 |
|
Dan Hansen
|
ee218ecd44
|
get rid of the hacky callbacks
|
2011-01-29 13:28:43 -08:00 |
|
Dan Hansen
|
3078156dbb
|
javascript i18n wip
|
2011-01-29 13:28:43 -08:00 |
|
Dan Hansen
|
7089782ba1
|
things having to do with publisher belong in publisher.js not stream.js
|
2011-01-29 14:42:59 -06:00 |
|
Dan Hansen
|
d03119f7e9
|
Embedder is now a widget, show videos before comments
|
2011-01-29 13:22:34 -06:00 |
|
Raphael
|
91bfdf0e75
|
Roll back infinite scroll plugin
|
2011-01-26 10:33:08 -08:00 |
|
maxwell
|
4e60d2b92e
|
update inf. scroll; fix pagniation showing/not showing in all the wrong places
|
2011-01-25 17:38:29 -08:00 |
|
maxwell
|
bc82dac61c
|
make the more button work in the mobile site, also, i finally fixed the timeago stuff in the scroll
|
2011-01-24 19:09:37 -08:00 |
|
maxwell
|
8b3beba93f
|
adding login page to mobile, and adding timeago WIP
|
2011-01-24 17:36:47 -08:00 |
|
Dan Hansen
|
161759b99a
|
fix 789
|
2011-01-24 02:40:24 -06:00 |
|
Dan Hansen
|
8293016348
|
make the footer not so useless
|
2011-01-23 23:53:17 -06:00 |
|
Dan Hansen
|
ace9e8c3d8
|
whoops, add license to embedder.js and it's spec
|
2011-01-22 23:43:48 -06:00 |
|
Dan Hansen
|
bdf559bb2b
|
remove video embedding from stream.js, use embedder.js
|
2011-01-22 23:40:08 -06:00 |
|
danielvincent
|
77042f9d47
|
publisher always shows textarea. outline publisher textarea in blue
|
2011-01-22 18:49:50 -08:00 |
|
Dan Hansen
|
45444316cb
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-22 12:40:36 -06:00 |
|
Dan Hansen
|
b209fd0c2c
|
our spec would complain about the data of the ajax request not being there, move it into the callback instead
|
2011-01-22 12:40:20 -06:00 |
|
MrZYX
|
cadcc3e7c3
|
some browers (Firefox for example) have no pushState, so disable it for those for now
|
2011-01-22 16:43:34 +01:00 |
|
Dan Hansen
|
8619a2035c
|
green for the night
|
2011-01-22 01:16:52 -06:00 |
|
Dan Hansen
|
a3bc8932d4
|
fixes for the alert widget, widgets.init didn't execute correctly because of the context
|
2011-01-21 20:09:34 -06:00 |
|
Dan Hansen
|
c23811e1ab
|
flash the user whether or not that person was moved to a different aspect
|
2011-01-21 20:02:42 -06:00 |
|
zhitomirskiyi
|
01a4327c2b
|
use google API instead of highcharts due to licensing
|
2011-01-21 13:00:08 -08:00 |
|
zhitomirskiyi
|
41993fe5da
|
use highcharts.js for stats
|
2011-01-21 12:19:05 -08:00 |
|
danielvincent
|
c5bf7b523f
|
use history.pushstate to preserve filters on page refresh
|
2011-01-21 11:11:00 -08:00 |
|
danielvincent
|
8af2fc7bcc
|
fix in calculating selected states on aspect filters
|
2011-01-21 01:16:34 -08:00 |
|
danielvincent
|
22d4083c8c
|
use history.pushstate to preserve filters on page refresh
|
2011-01-21 01:10:29 -08:00 |
|
zhitomirskiyi
|
a00fbb1717
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-14 16:11:37 -08:00 |
|
maxwell
|
bc8821fdc5
|
Revert "some fixes for the alert widget"
This reverts commit 4e40c19342.
|
2011-01-14 14:28:03 -08:00 |
|
Dan Hansen
|
4e40c19342
|
some fixes for the alert widget
|
2011-01-14 15:13:09 -06:00 |
|