zhitomirskiyi
8bcf1b49c7
notifier for the messages, we're so close
2011-03-08 10:53:49 -08:00
MrZYX
fd0bc8a09a
updated locales
2011-03-08 15:38:18 +01:00
danielgrippi
97aff09140
added autocomplete on message 'to' field, minor css tweaks to inbox
2011-03-07 11:22:59 -08:00
Raphael Sofaer
e00a033e9e
Update rspec-instafail, test git headers
2011-03-06 10:18:37 -08:00
MrZYX
c79b55f520
updated locales
2011-03-05 16:32:01 +01:00
MrZYX
06ff32d8d5
updated locales
2011-03-04 14:43:44 +01:00
danielgrippi
5f55dfa1bc
private message inbox wip
2011-03-03 17:32:26 -08:00
Raphael Sofaer
3d0831f2b2
Merge remote branch 'mnutt/photo_upload_status'
2011-03-03 11:43:16 -08:00
MrZYX
8ab54076f8
updated locales
2011-03-02 22:45:31 +01:00
zhitomirskiyi
3812612c86
added a validation of participant, as well as messages controller spec wip
2011-03-01 19:24:07 -08:00
Raphael Sofaer
0cb218bba0
Delete statistic and data point models
2011-03-01 16:54:12 -08:00
danielvincent
1072806d8f
PrivateMessage -> Conversation, Message.
2011-03-01 12:25:55 -08:00
danielvincent
979d9d7fb4
added delete actions for private messages
2011-03-01 12:14:31 -08:00
danielvincent
090c412690
touched up AspectMembership resource
2011-03-01 12:14:31 -08:00
danielvincent
9fe0320881
added PrivateMessage and PrivateMessageVisibility models and migrations
2011-03-01 12:14:31 -08:00
MrZYX
31f5500b11
removed RAILS_ENV=test example from config/server.sh
2011-03-01 17:28:35 +01:00
Michael Nutt
ac2c50b33f
denote that fileuploader has been modified
2011-02-28 20:37:41 -05:00
Raphael Sofaer
d8956a7cd5
Add foreign key constraints
2011-02-28 15:18:35 -08:00
MrZYX
98999b1703
updated locales
2011-02-28 22:15:15 +01:00
MrZYX
a42c1225d1
updated locales
2011-02-26 14:31:54 +01:00
MrZYX
afecfe5e93
save the correct url on redirect in http_multi job; be tolerant about messed up urls in the db
2011-02-26 14:22:14 +01:00
Dan Hansen
3538bda06d
fix email subject wording
2011-02-25 16:56:21 -06:00
Paweł Wilk
c5e0bc40bb
Inflection aliases updated
2011-02-25 22:09:54 +01:00
MrZYX
ee96dea398
update i18n-inflector to 2.5.1; correct Polski to polski; fixed locales; thanks siefca
2011-02-25 21:41:32 +01:00
MrZYX
9fdf1e599f
updated locales
2011-02-25 15:58:34 +01:00
MrZYX
d4fb1d8af6
added README to rails-i18n directory
2011-02-25 14:35:18 +01:00
Raphael Sofaer
736783abd7
You can't call post.person when post is nil. We should probably just reject and delete the invalid notifications in the controller, keeping them in the view is aggravating
2011-02-24 11:13:25 -08:00
MrZYX
ff796efce0
updated locales
2011-02-24 16:25:43 +01:00
MrZYX
62badaa0df
updated catalan locale
2011-02-24 16:24:05 +01:00
MrZYX
ea6dc0eb9a
updated locales
2011-02-24 00:39:00 +01:00
MrZYX
98cdee97c0
Merge branch '619-gender-aware-translations' of https://github.com/siefca/diaspora into inflections
...
Conflicts:
Gemfile
app/controllers/application_controller.rb
app/controllers/posts_controller.rb
app/controllers/publics_controller.rb
2011-02-24 00:33:34 +01:00
zhitomirskiyi
e106ec6a79
added post author to the subject of the also commented email as well as the notification
2011-02-23 13:03:11 -08:00
Dan Hansen
9ef6606f80
load jquery from google only if local copy fails
2011-02-22 13:41:05 -06:00
MrZYX
e943d6ae5e
updated locales
2011-02-22 16:12:06 +01:00
MrZYX
3d034668fd
Revert "updated locales"
...
This reverts commit 85c346b520
2011-02-22 16:07:31 +01:00
MrZYX
85c346b520
updated locales
2011-02-22 13:59:23 +01:00
MrZYX
65447e63ec
Catalan locale update from Jordi Mallach
2011-02-22 13:51:38 +01:00
MrZYX
feb47df97e
total refactor of version header. X-Git-Update: ISO 8601 formated date of the last commit, X-Git-Revision: sha1 hash of the last commit
2011-02-21 17:13:11 +01:00
MrZYX
e02c3eafc0
Merge branch 'xheader' of https://github.com/diasporg/diaspora into xheader
2011-02-21 16:12:24 +01:00
MrZYX
e4ae0ddf67
updated locales
2011-02-21 15:32:32 +01:00
MrZYX
ab706f4127
fixed sort by css for languages different from english
2011-02-20 19:00:13 +01:00
MrZYX
abf385d79d
collapsed langcodes_alias_map.yml and languages.yml into locale_settings.yml
2011-02-20 14:35:24 +01:00
MrZYX
47d2b752c2
updated locales
2011-02-20 13:14:35 +01:00
MrZYX
096e5e577b
updated locales
2011-02-19 12:00:07 +01:00
MrZYX
124ac738ea
'sort by:'translatable
2011-02-19 11:39:28 +01:00
maxwell
43f17b3ed8
made toggle for post time on aspects#index
2011-02-18 16:47:44 -08:00
maxwell
0bf3cae54a
MS IZ added spec from admin page, moved it to its own controller where it belongs
2011-02-18 11:35:24 -08:00
maxwell
c3e101112d
add missing translation
2011-02-18 10:32:21 -08:00
MrZYX
ece7cddc51
added license to javascripts.en.yml; better langcodes_alias_map.yml; .gitignore users.yaml fixture
2011-02-18 17:22:19 +01:00
MrZYX
666c040c1d
updated locales
2011-02-18 17:21:11 +01:00
zhitomirskiyi
a68dfbcabc
removed the share_with route
2011-02-17 18:05:21 -08:00
zhitomirskiyi
16b7ec3990
pulled out share_with to be contact new and contact show
2011-02-17 18:05:21 -08:00
maxwell
7ace73b84b
iz ms wip fixing contactController destroy
2011-02-17 18:05:21 -08:00
maxwell
17a801394e
work in progress. need to update the views for the controller changes
2011-02-17 18:05:21 -08:00
maxwell
6858e2e543
crazy ugly admin interface so an admin can invite people, and search for user accounts for basic debugging
2011-02-17 18:00:59 -08:00
MrZYX
026ced5276
updated locales
2011-02-17 15:46:53 +01:00
Raphael Sofaer
6cf8de94a7
take secret token stuff out of chef scripts
2011-02-16 22:46:43 -05:00
MrZYX
2161c1dd72
updated locales
2011-02-16 15:42:23 +01:00
maxwell
d1b91e1eac
wip, profiles controller and specs, with cucumber failures
2011-02-15 14:17:25 -08:00
David Morley
151b23f77b
remove modulization part
2011-02-15 11:11:40 -08:00
David Morley
e3df222d0e
move file
2011-02-15 10:42:02 -08:00
MrZYX
f7de3a216a
fixed a translation
2011-02-15 15:02:36 +01:00
MrZYX
7fb6c5bcb9
updated locales
2011-02-15 13:43:45 +01:00
MrZYX
614aa3056a
updated locales
2011-02-14 17:46:13 +01:00
danielvincent
164fe1c1b5
adjust column width, leading, serifs, etc. in stream for better readability.
2011-02-13 15:27:14 -08:00
zhitomirskiyi
50ea657cd2
put it back for reference
2011-02-13 15:14:27 -08:00
zhitomirskiyi
9f78156206
broke out the en activerecord validations translations to their respective file
2011-02-13 15:09:05 -08:00
MrZYX
86cc7a0d35
added some languages
2011-02-13 13:36:06 +01:00
MrZYX
654be58a87
moved gl-ES to gl and added it to languages.yml
2011-02-13 13:18:58 +01:00
MrZYX
81369176f1
updated locales
2011-02-13 12:02:03 +01:00
MrZYX
935b934b7a
Merge branch 'pubphoto' of https://github.com/diasporg/diaspora
2011-02-13 11:56:20 +01:00
David Morley
9b88eef832
add photos.show.original_post
2011-02-12 16:11:37 -08:00
David Morley
d030343048
turn off gzip on jammit
2011-02-12 15:08:45 -08:00
MrZYX
cd2d7db7b2
workaround from https://rails.lighthouseapp.com/projects/8994/tickets/5329-using-i18nwith_locale-in-actionmailer-raises-systemstackerror
2011-02-12 21:31:14 +01:00
MrZYX
a572637e4c
fix a translation
2011-02-12 18:06:56 +01:00
MrZYX
8639e08920
updated locales
2011-02-12 14:41:13 +01:00
Raphael Sofaer
d202200a88
tweak copy
2011-02-11 18:04:00 -08:00
zhitomirskiyi
ea3afa6720
added the mention explanation text
2011-02-11 17:31:23 -08:00
MrZYX
3dbfc85aa9
updated locales
2011-02-11 17:20:07 +01:00
Raphael Sofaer
bb58544a70
Add logging for GC (slight slowdown, but worth it for the data)
2011-02-10 15:52:00 -08:00
maxwell
c6e0379a00
fixing engrish in translation
2011-02-10 14:02:36 -08:00
zhitomirskiyi
717d2e09c9
fixed the translation in the email
2011-02-10 12:39:05 -08:00
zhitomirskiyi
d1771bbe17
notifications for mentions
2011-02-10 12:39:05 -08:00
Raphael Sofaer
f1c63939f9
Revert "added sliding animation to stream elements, shadow on autocomplete box."
...
This reverts commit dc760f9583
2011-02-10 10:36:30 -08:00
MrZYX
4997fbdbd9
updated locales
2011-02-10 15:41:43 +01:00
danielvincent
dc760f9583
added sliding animation to stream elements, shadow on autocomplete box.
2011-02-09 20:07:25 -08:00
maxwell
b24272474d
document s3 in app_config.yml.example
2011-02-09 17:42:21 -08:00
Raphael Sofaer
cb67c14a51
Make cap deploy follow a branch in deploy_config.yml
2011-02-09 16:07:24 -08:00
Raphael Sofaer
0ec2d918bb
adding keycodes file, moving keyup stuff to keydown
2011-02-09 16:07:24 -08:00
MrZYX
f0650a6135
updated locales
2011-02-09 17:05:47 +01:00
zhitomirskiyi
eecf1d5d82
fixed cucumber, localization, and css
2011-02-08 17:14:37 -08:00
zhitomirskiyi
4e96d11cd0
Revert "refactored local person person friend finder functionality to use the partial"
...
This reverts commit 9f4035ab019803fc53844e70884b0519142deb18.
Conflicts:
app/views/services/_remote_friend.html.haml
app/views/users/getting_started/_step_3.html.haml
refactored invitations, added them to the last page
fixed styling on adding an aspect to the aspect list
added a facebook for person edit aspect memberships
touched up and simplified sign-up flow
fix styling on step 3
2011-02-08 16:40:33 -08:00
zhitomirskiyi
d147da1b4a
invitation text
...
setting the invites
added requests to the fb hash
finder has options
remove the requester from the list
typo
making a block
another typo
remove the if statement for the notifications
checking on the right field
translations and correct indenting
fixed stuff added
added a temp puts
added a temp puts
now actually referencing the service
not double nesting
remove stream element
updated remote friends to old style
removed it from the h1 block
putting the stream element back
2011-02-08 16:40:32 -08:00
zhitomirskiyi
a398184081
WIP
2011-02-08 16:35:33 -08:00
zhitomirskiyi
7241177421
translating the warning about removing the person from the last aspect
2011-02-08 15:44:12 -08:00
MrZYX
6e0e46435e
localize dates
2011-02-08 16:26:56 +01:00
MrZYX
2c06397fd9
updated locales
2011-02-08 15:06:12 +01:00
danielvincent
bf20e5a9e8
remove some js assets from mobile
2011-02-06 23:09:04 -08:00
danielvincent
42993de739
added back to comments; avatar.
2011-02-06 09:26:24 -08:00
MrZYX
b26e214001
updated locales
2011-02-06 16:04:06 +01:00
zhitomirskiyi
59f0dca7c7
Revert "publisher is now a hot widget"
...
This reverts commit 8039ab312a
2011-02-05 15:24:20 -08:00
zhitomirskiyi
b49f54144e
resending of invitation in resque and works
2011-02-05 15:01:04 -08:00
zhitomirskiyi
2c1c2a4a8a
WIP
2011-02-05 15:01:04 -08:00
zhitomirskiyi
83a9e916e4
resending of invitation in resque and works
2011-02-05 15:01:04 -08:00
zhitomirskiyi
da6e16b3a4
WIP
2011-02-05 15:01:04 -08:00
Dan Hansen
8039ab312a
publisher is now a hot widget
2011-02-05 16:47:43 -06:00
MrZYX
5b1737b817
updated locales
2011-02-04 19:11:39 +01: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
danielvincent
8269e4b300
touched up photo show and status message show pages
2011-02-03 13:05:25 -08:00
MrZYX
9ae6ba4d66
updated locales
2011-02-03 15:35:59 +01:00
MrZYX
99cf9904f9
put jquery-ui back in as we need it for /aspects/manage at least
2011-02-02 16:56:50 +01:00
MrZYX
5ed587ddcd
updated locales
2011-02-02 16:23:12 +01:00
MrZYX
423cd7807b
Merge branch 'master' of github.com:diaspora/diaspora
2011-02-01 22:45:28 +01:00
MrZYX
15329af94d
made "Search for" translatable
2011-02-01 21:55:28 +01:00
zhitomirskiyi
bc058332d3
commented on post email now includes the comment
2011-02-01 12:54:05 -08: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
Raphael
c56eaadfa0
Make person profile a little bit aware of an incoming request
2011-01-31 15:47:01 -08:00
Raphael
0e2243e620
use capture and captures to detect thins in /service
2011-01-31 15:28:43 -08:00
Raphael
a2bb8515f9
Update cap scripts to have separate staging and production environments, use bundler
2011-01-31 15:28:43 -08:00
MrZYX
0c802677c4
updated locales
2011-01-31 14:33:10 +01:00
Sarah Mei
c40a266910
Deploy with capistrano.
2011-01-30 22:00:32 -08:00
Sarah Mei
25dc3bab8f
removing config/deploy_config.yml from git
2011-01-30 21:52:38 -08:00
MrZYX
3b3807e8df
updated locales
2011-01-30 10:10:53 +01:00
MrZYX
f487df2961
added javascripts:timeago to the master file
2011-01-30 09:27:12 +01:00
MrZYX
9e457f30ae
moved javascript translations to their own files
2011-01-30 09:24:57 +01: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
a6530f4db1
fix yaml structure
2011-01-29 16:09:19 -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
b89a59ca55
update timeago usages
2011-01-29 13:30:32 -08:00
Dan Hansen
3078156dbb
javascript i18n wip
2011-01-29 13:28:43 -08:00
Dan Hansen
d03119f7e9
Embedder is now a widget, show videos before comments
2011-01-29 13:22:34 -06:00
MrZYX
8150cd4317
remove mongodb from app_config.yml.example
2011-01-29 15:38:26 +01:00
MrZYX
f371ac9c74
updated locales
2011-01-29 15:07:10 +01:00
Raphael
7302a54710
Fix translation missing error
2011-01-28 17:50:34 -08:00
Raphael
ac4880cb0d
scope translations correctly
2011-01-28 17:39:41 -08:00
zhitomirskiyi
dcf6469ded
visible contacts option on aspect edit pane
2011-01-27 13:41:22 -08:00
Raphael
94ae7a678b
Placeholder views for contacts_visible in aspects
2011-01-27 13:41:22 -08:00
MrZYX
cbfefc8fc3
fixed some untranslatable strings, thanks to Nygu
2011-01-27 21:04:03 +01:00
MrZYX
087e0389bb
Merge branch '712-route-for-login' of https://github.com/TomK32/diaspora
2011-01-27 18:38:51 +01:00
MrZYX
45c590a3bf
Merge branch 'fix_typo_at_default_language' of https://github.com/jairodiaz/diaspora
2011-01-27 18:27:23 +01:00
MrZYX
14f4e1aa57
some fixes to the translations of the mobile site
2011-01-27 18:20:25 +01:00
MrZYX
eba99c84ba
made 'mark all as read' translatable
2011-01-27 17:13:27 +01:00
MrZYX
e9dddca86d
updated locales
2011-01-27 17:04:39 +01:00
zhitomirskiyi
bc81154c46
consolidated invite/invite friends sections on aspect/index
2011-01-26 18:05:42 -08:00
zhitomirskiyi
9bd6b11ddf
made facebox wider, remove disable with, added default profile photo for those not connected to diaspora
2011-01-26 17:50:49 -08:00
zhitomirskiyi
8941448866
placed friend finder in facebox. added translations
2011-01-26 17:44:40 -08:00
