Raphael Sofaer
|
d5ecce7ca6
|
Merge branch 'limit_similar_contacts'
Conflicts:
app/controllers/people_controller.rb
|
2011-04-12 11:48:41 -07:00 |
|
Dan Hansen
|
425fee0653
|
fix #839
|
2011-04-12 12:00:33 -05:00 |
|
MrZYX
|
7362c8f79f
|
updated locales
|
2011-04-12 16:24:59 +02:00 |
|
Raphael Sofaer
|
080f08187d
|
Disable typhoeus everywhere but the HTTPMulti specs
|
2011-04-11 14:52:21 -07:00 |
|
MrZYX
|
8b4c8e77cb
|
added direction detector widget to jasmine.yml
|
2011-04-11 22:23:21 +02:00 |
|
MrZYX
|
93be252b59
|
Merge branch 'css-rtl'
Conflicts:
public/javascripts/application.js
public/javascripts/inbox.js
|
2011-04-11 21:52:01 +02:00 |
|
behrooz shabani (everplays)
|
69eb27cbe9
|
moved comments textarea to left so it wont disappear avatar in RTL UI
|
2011-04-12 00:12:39 +04:30 |
|
behrooz shabani (everplays)
|
60371c8981
|
swapped horizontal margins on links of #conversation_controls in RTL UI
|
2011-04-12 00:03:56 +04:30 |
|
behrooz shabani (everplays)
|
426c1b28b6
|
minor fixes on conversations list & sign up stuff
|
2011-04-11 23:58:33 +04:30 |
|
behrooz shabani (everplays)
|
22b0fca124
|
small fixes on settings & notifications pages in RTL UI
|
2011-04-11 23:13:38 +04:30 |
|
behrooz shabani (everplays)
|
e076f89ccd
|
fixed comment box in RTL UI
|
2011-04-11 22:56:22 +04:30 |
|
behrooz shabani (everplays)
|
ad34a7f6f7
|
implemented RTL UI for settings/conversations/notifications
|
2011-04-11 22:44:55 +04:30 |
|
MrZYX
|
8631b6cc1e
|
I stop coding for today, sorry -.-
|
2011-04-11 19:47:29 +02:00 |
|
MrZYX
|
e063f619a0
|
fixed jasmine
|
2011-04-11 19:44:31 +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
|
e91c153257
|
fixed #1013 thanks jbivins
|
2011-04-11 17:08:36 +02:00 |
|
MrZYX
|
71f7fcf22f
|
updated locales
|
2011-04-10 22:25:54 +02:00 |
|
behrooz shabani (everplays)
|
cddeafee74
|
rtl UI for aspects implemented
|
2011-04-11 00:21:14 +04:30 |
|
MrZYX
|
d59a1f1233
|
updated locales
|
2011-04-10 00:25:19 +02:00 |
|
MrZYX
|
54aa2c7ce3
|
whoops, let's not break inital fetching
|
2011-04-09 20:21:27 +02:00 |
|
MrZYX
|
e7eb9adbf5
|
do not webfinger if we have no clue about the handle
|
2011-04-09 18:40:40 +02:00 |
|
MrZYX
|
fbe91aba3a
|
refetch profile if it's missing, comment out hydra stub for now because it breaks the specs
|
2011-04-09 15:20:28 +02:00 |
|
danielgrippi
|
914e35dcad
|
stub hydra for great success. also, make local_luke, local_leia, and remote_raphael fixtures.
|
2011-04-08 18:24:02 -07:00 |
|
Raphael Sofaer
|
fa59be2353
|
Another bit of JS cleanup
|
2011-04-08 16:11:13 -07:00 |
|
Raphael Sofaer
|
0b9575af5d
|
JS cleanup
|
2011-04-08 16:11:13 -07:00 |
|
MrZYX
|
bb2b708a69
|
basename vs. dirname fail -.-, sorry my bad
|
2011-04-08 22:01:10 +02:00 |
|
Raphael Sofaer
|
927ba96fcc
|
Take out broken 'start sharing' link from mobile site
|
2011-04-08 11:09:56 -07:00 |
|
Raphael Sofaer
|
f8359bd77d
|
Fix PeopleController#show mobile
|
2011-04-08 10:37:08 -07:00 |
|
Raphael Sofaer
|
761411e153
|
Mostly fix PeopleController#show for mobile
|
2011-04-08 10:37:08 -07:00 |
|
MrZYX
|
f194166841
|
moar garbage for you aka fixed #1005
|
2011-04-08 17:46:45 +02:00 |
|
MrZYX
|
75629018db
|
you want the id in aspect_memberships#destroy to be garbage? There you go… (btw. fixed #1006)
|
2011-04-08 17:40:59 +02:00 |
|
Raphael Sofaer
|
c7dc6ce817
|
Fix jasmine specs
|
2011-04-07 18:30:29 -07:00 |
|
Raphael Sofaer
|
d23ac3468b
|
rename widgetCollection#ready to widgetCollection#initialized
|
2011-04-07 18:23:24 -07:00 |
|
Raphael Sofaer
|
ea932c8706
|
Fix infieldLabels in infiniteScrolled comment forms. We were initing every widget twice?
|
2011-04-07 18:21:28 -07:00 |
|
maxwell
|
d7c4e15835
|
let admin give a user 10 ma user 10 more invites
|
2011-04-07 17:54:22 -07:00 |
|
Raphael Sofaer
|
75d514c448
|
Fix infieldLabels on new aspect box
|
2011-04-07 17:53:07 -07:00 |
|
maxwell
|
48cfa49582
|
change the mention notification wording to be less akward
|
2011-04-07 17:45:03 -07:00 |
|
Raphael Sofaer
|
e2103788f5
|
Merge branch 'tag_name_uniqueness'
|
2011-04-07 17:00:58 -07:00 |
|
Raphael Sofaer
|
a05b141366
|
Add tagged posts to db seed, make people#show and tags#show infinite scroll
|
2011-04-07 16:36:14 -07:00 |
|
Raphael Sofaer
|
d8ac8d1329
|
Fix infinite scroll javascript in jammed js
|
2011-04-07 15:22:03 -07:00 |
|
Raphael Sofaer
|
157b117469
|
Just style links directly
|
2011-04-07 15:13:37 -07:00 |
|
Raphael Sofaer
|
d12ec38736
|
Fix mobile infinite scroll
|
2011-04-07 15:00:57 -07:00 |
|
Raphael Sofaer
|
883ff63ec9
|
Add some posting to rake db:seed
|
2011-04-07 15:00:57 -07:00 |
|
maxwell
|
51b3cd9c77
|
attempt to fix the problem where people who wanted emails were no longer getting them
|
2011-04-07 14:05:40 -07:00 |
|
MrZYX
|
bea1f26c14
|
updated locales
|
2011-04-07 22:43:54 +02:00 |
|
MrZYX
|
ef124d748b
|
fixed another require for ruby 1.9, #1002
|
2011-04-07 21:48:22 +02:00 |
|
Raphael Sofaer
|
52eac27a43
|
Add infinite scroll to mobile
|
2011-04-07 11:38:38 -07:00 |
|