MrZYX
|
93be252b59
|
Merge branch 'css-rtl'
Conflicts:
public/javascripts/application.js
public/javascripts/inbox.js
|
2011-04-11 21:52:01 +02:00 |
|
MrZYX
|
440fd26c14
|
hopefully finally fix #946
|
2011-04-11 19:15:14 +02:00 |
|
MrZYX
|
ffbe94f75c
|
revert moved add aspect button to the left for rtl languages, this is already done by CSS
|
2011-04-11 18:04:50 +02:00 |
|
MrZYX
|
2413b3c4bd
|
Merge branch 'css-rtl' of https://github.com/everplays/diaspora into css-rtl
|
2011-04-11 18:01:09 +02:00 |
|
MrZYX
|
cf61bb756d
|
added dir attribute to html element; made tipsy gravity dependant on that
|
2011-04-11 18:00:28 +02:00 |
|
MrZYX
|
e7d48a16ee
|
moved + to the left for rtl languages
|
2011-04-05 19:33:51 +02:00 |
|
MrZYX
|
e4db8c7a36
|
fixed #589, no CSS!
|
2011-04-03 02:10:41 +02:00 |
|
MrZYX
|
f98a4ee42c
|
correct links to atom feed
|
2011-04-02 17:35:23 +02:00 |
|
MrZYX
|
b086142b16
|
fixed #991
|
2011-04-02 15:09:41 +02:00 |
|
danielgrippi
|
8b8ea03582
|
high res logo on mobile site
|
2011-04-01 11:12:41 -07:00 |
|
maxwell
|
4bd0cbfdc8
|
publisher now can handle services, and is on seperate page
|
2011-04-01 01:18:01 -07:00 |
|
maxwell
|
569fb66e9e
|
bunch of small mobile ui fixes
|
2011-03-31 23:38:38 -07:00 |
|
maxwell
|
69befc059d
|
ms iz fixed a bit of the mobile site
|
2011-03-31 18:32:19 -07:00 |
|
maxwell
|
bb59df46f9
|
updating jquery mobile, fix the menu page a bit
|
2011-03-31 18:19:51 -07:00 |
|
MrZYX
|
56a6f0e43b
|
cleaned up craziness in users and likes routing, fixed #961
|
2011-03-24 03:02:14 +01:00 |
|
zhitomirskiyi
|
18c7c467c7
|
made the manage email prefs work
|
2011-03-23 16:36:16 -07:00 |
|
danielgrippi
|
b9b9d7e07d
|
renamed home to all aspects in header, made clicking aspect names on right trigger filtering
|
2011-03-23 10:29:34 -07:00 |
|
maxwell
|
a036a8035f
|
add a plaintext layout for emails, and include a link to change your email settings in the emails
|
2011-03-22 12:26:38 -07:00 |
|
Sarah Mei
|
0b1fa4d014
|
You can now add contacts from tags#show. Also, a CSS change to help us start refactoring: there's now a class to the body that you can set with content_for :body_class. This lets you scope CSS to a particular page. Started breaking out smaller CSS files.
|
2011-03-19 20:53:55 -07:00 |
|
danielgrippi
|
c608c70ca7
|
tagging profiles complete
|
2011-03-15 13:21:36 -07:00 |
|
danielgrippi
|
d0569fb881
|
simplified functionality on aspect edit faceboxes
|
2011-03-09 12:00:49 -08:00 |
|
danielgrippi
|
1f5edb1d92
|
Merge branch 'private_messages'
Conflicts:
app/controllers/status_messages_controller.rb
app/models/data_point.rb
app/models/status_message.rb
db/schema.rb
lib/fake.rb
public/stylesheets/sass/application.sass
spec/models/mention_spec.rb
|
2011-03-08 21:23:41 -08:00 |
|
danielgrippi
|
d38e3a6b29
|
added translations to all conversation/message views. tweaked css
|
2011-03-08 15:51:46 -08:00 |
|
MrZYX
|
7b5b980095
|
link to public feed of the person on the profile person show page instead of to the one of current_user
fixed #700
fixed #864
fixed #774
|
2011-03-08 20:30:48 +01:00 |
|
danielgrippi
|
fca5310c77
|
dispatch the conversation in ConversationsController
|
2011-03-07 17:54:25 -08:00 |
|
danielgrippi
|
97aff09140
|
added autocomplete on message 'to' field, minor css tweaks to inbox
|
2011-03-07 11:22:59 -08:00 |
|
MrZYX
|
f0ba62be59
|
replaced ▼ with ▼, this fixes #904 and shouldn't harm anything.
|
2011-03-03 21:32:44 +01:00 |
|
Sarah Mei
|
ba6afa50e8
|
Removing extra csrf tag. Thx feanor12.
|
2011-03-01 22:25:05 -08:00 |
|
Dan Hansen
|
9ef6606f80
|
load jquery from google only if local copy fails
|
2011-02-22 13:41:05 -06:00 |
|
Sarah Mei
|
49adf5034f
|
Revert javascript move
|
2011-02-20 20:05:40 -08:00 |
|
danielvincent
|
3d6d742def
|
move js to body bottom
|
2011-02-20 16:31:06 -05:00 |
|
zhitomirskiyi
|
199d5fbdc1
|
the alt text now displays the correct number of contacts in an aspect
|
2011-02-18 17:44:47 -08:00 |
|
maxwell
|
d1b91e1eac
|
wip, profiles controller and specs, with cucumber failures
|
2011-02-15 14:17:25 -08:00 |
|
Raphael Jedidiah Sofaer
|
150f676332
|
Do a bunch of work on publisher autocompletion JS
|
2011-02-09 16:07:23 -08:00 |
|
MrZYX
|
4328f72bfb
|
fixed piwik
|
2011-02-09 19:37:05 +01:00 |
|
danielvincent
|
80117d8ab6
|
added piwik and ga options to mobile layout
|
2011-02-08 17:39:41 -08:00 |
|
danielvincent
|
bf20e5a9e8
|
remove some js assets from mobile
|
2011-02-06 23:09:04 -08:00 |
|
maxwell
|
ce010c24ec
|
update jquery mobile to a3
|
2011-02-03 20:41:38 -08:00 |
|
maxwell
|
ee02a073cd
|
toggle mobile site, when mobile device
|
2011-02-03 18:43:56 -08:00 |
|
Raphael
|
3fb6b0e072
|
Fix saved state cucumber feature
|
2011-02-02 11:52:56 -08:00 |
|
Raphael
|
cfd6639f4d
|
Revert "Merge branch 'open-aspects'"
This reverts commit 181bd823c4, reversing
changes made to 2c3ed2ab73.
|
2011-02-01 13:15:20 -08:00 |
|
zhitomirskiyi
|
55403d9bea
|
the saved aspects works properly now
|
2011-02-01 12:07:18 -08:00 |
|
MrZYX
|
391a9b0de5
|
translate contacts in _header.haml
|
2011-01-31 19:48:36 +01:00 |
|
Dan Hansen
|
b89a59ca55
|
update timeago usages
|
2011-01-29 13:30:32 -08:00 |
|
Dan Hansen
|
0831ad6e40
|
move i18n.loadLocale to the application template, remove localize controller & helper, renamed localize to get_javascript_strings_for and added it to the application helper
|
2011-01-29 13:29:54 -08:00 |
|
Raphael
|
767e58bf94
|
Correct email picture url
|
2011-01-28 11:43:15 -08:00 |
|
zhitomirskiyi
|
ced2c18da1
|
remove caching the footer due to localization issues
|
2011-01-27 14:17:50 -08:00 |
|
zhitomirskiyi
|
0fa0b7e950
|
fixed syntax error in mobile layout. removed ipad from mobile_fu
|
2011-01-27 11:30:15 -08:00 |
|
MrZYX
|
14f4e1aa57
|
some fixes to the translations of the mobile site
|
2011-01-27 18:20:25 +01:00 |
|
maxwell
|
8b3beba93f
|
adding login page to mobile, and adding timeago WIP
|
2011-01-24 17:36:47 -08:00 |
|