Raphael Sofaer
|
e964490a9a
|
Escape xml before dispatch
|
2011-02-23 16:06:55 -08:00 |
|
Raphael Sofaer
|
faf026dec6
|
Update dispatcher to use HttpMulti job
|
2011-02-23 16:06:55 -08:00 |
|
maxwell
|
bb5d5fc2c0
|
typhoeus fixes and a few changes to the chef scripts
|
2011-02-23 16:06:55 -08:00 |
|
maxwell
|
638311125f
|
typhoeus should now be in. there is a new dependancy on curl and the curl dev headers, so install
|
2011-02-23 16:06:55 -08:00 |
|
maxwell
|
c9dd2d5b50
|
add files
|
2011-02-23 16:06:54 -08: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 |
|
zhitomirskiyi
|
97e00f9ee3
|
changed the delete to a destroy on retraction, also removed a puts
|
2011-02-23 12:00:42 -08:00 |
|
maxwell
|
16e8ecc72c
|
fixing debugging statement in smcontroller, also fix the spec
|
2011-02-22 22:38:23 -08:00 |
|
maxwell
|
e446dcaeb5
|
make sm_controller show the error in the js
|
2011-02-22 22:21:48 -08:00 |
|
maxwell
|
5bce2d1615
|
remove mongomapper error handler in photos_controller#create
|
2011-02-22 22:02:58 -08:00 |
|
maxwell
|
ec21230756
|
make status_message_controller#create return the error message
|
2011-02-22 22:01:08 -08:00 |
|
Dan Hansen
|
e4ba498d70
|
whoops
|
2011-02-22 23:21:50 -06:00 |
|
Dan Hansen
|
f41bc0c14d
|
<3z
|
2011-02-22 23:19:57 -06:00 |
|
Raphael Sofaer
|
74b8921c09
|
make video urls have correct href
|
2011-02-22 18:51:40 -08:00 |
|
maxwell
|
eb9a943724
|
parinoid checks for admin page thx dangold
|
2011-02-22 15:43:10 -08:00 |
|
Dan Hansen
|
9ef6606f80
|
load jquery from google only if local copy fails
|
2011-02-22 13:41:05 -06:00 |
|
Dan Hansen
|
e04685e7ab
|
remove unused javascript that's in a view
|
2011-02-21 23:25:38 -06: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 |
|
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 |
|
MrZYX
|
da244f8438
|
reintroduced remember me on the login page
|
2011-02-20 21:49:08 +01:00 |
|
MrZYX
|
ab706f4127
|
fixed sort by css for languages different from english
|
2011-02-20 19:00:13 +01:00 |
|
MrZYX
|
77cac72ed5
|
fixed #306
|
2011-02-20 13:34:22 +01:00 |
|
MrZYX
|
2b625c468a
|
Merge branch '874-wrong-time-ago-on-notifications' of https://github.com/grzuy/diaspora
|
2011-02-20 13:03:33 +01:00 |
|
MrZYX
|
af14fa76a1
|
fixed #881
|
2011-02-20 13:00:30 +01:00 |
|
Gonzalo Rodriguez
|
ea3b719253
|
Fixed notifications time-ago calculation
|
2011-02-20 05:13:34 -02:00 |
|
Sarah Mei
|
77adc02cbd
|
Fix spec failure related to presence of app config settings. Also, you can't test application controller directly.
|
2011-02-19 22:17:22 -08:00 |
|
MrZYX
|
aa6ac41d68
|
remeber sort order
|
2011-02-19 17:06:26 +01:00 |
|
MrZYX
|
11f95ee596
|
fixed broken css for other languages at account settings page
|
2011-02-19 14:27:45 +01:00 |
|
Jonne Hass
|
02f7f10ef1
|
Minimal fix to admins_controller.rb
|
2011-02-19 04:49:05 -08:00 |
|
MrZYX
|
124ac738ea
|
'sort by:'translatable
|
2011-02-19 11:39:28 +01:00 |
|
Gonzalo Rodriguez
|
778afa2889
|
Update locale before loading flash notice on user language update
|
2011-02-19 02:25:03 -02:00 |
|
zhitomirskiyi
|
199d5fbdc1
|
the alt text now displays the correct number of contacts in an aspect
|
2011-02-18 17:44:47 -08:00 |
|
zhitomirskiyi
|
61dd5a835a
|
default scope on contact
|
2011-02-18 17:38:02 -08:00 |
|
maxwell
|
43f17b3ed8
|
made toggle for post time on aspects#index
|
2011-02-18 16:47:44 -08:00 |
|
maxwell
|
3c8a87783f
|
stream order can take created at to be sorted by origin post time
|
2011-02-18 16:07:22 -08:00 |
|
maxwell
|
37a699ace1
|
stream order can take created at to be sorted by origin post time
|
2011-02-18 16:01:04 -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
|
e3b298c5d4
|
this may be temp. i want to see if ci passes; Revert "I18n: Workaround for a weired caching issue when multiple users are logged in"
This reverts commit dfa5d875c5.
|
2011-02-17 19:01:42 -08:00 |
|
maxwell
|
2540c5adb9
|
adding person and profile to show
|
2011-02-17 18:15:35 -08:00 |
|
zhitomirskiyi
|
8196ee33dd
|
making instantiating an empty contact
|
2011-02-17 18:05:22 -08:00 |
|
zhitomirskiyi
|
23754ec3fb
|
added the files
|
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 |
|
zhitomirskiyi
|
25671f07c7
|
refactor of a line
|
2011-02-17 18:05:21 -08:00 |
|
zhitomirskiyi
|
ba779e18d6
|
aspect memberships are now dependant delete_all on contact
|
2011-02-17 18:05:21 -08:00 |
|
zhitomirskiyi
|
1e6bf9c80e
|
MS IZ the cucumber now passes
|
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
|
8c2e6dd8cb
|
aspect membership refactor complete
|
2011-02-17 18:05:21 -08:00 |
|
maxwell
|
c6eb5d0340
|
IZ MS; refactored aspect_membership_controller, moved and updated views accordingly
|
2011-02-17 18:05:21 -08:00 |
|