nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
14631 commits 4 branches 0 tags 121 MiB
Commit graph

14631 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonne Haß
2d9c6a945d Don't let the dropdown indicator flow into the user name in the user 
menu
 2014-09-03 15:53:01 +02:00
Jonne Haß
b5de6cded9 Merge pull request #5200 from jhass/static_user_menu 
Prevent user menu from moving
 2014-09-03 11:16:06 +02:00
Steffen van Bergerem
a627f65ef9 Correct default rails environment 2014-09-02 14:25:51 +02:00
Jonne Haß
12dc9cbc23 prevent user menu from moving 2014-09-02 01:17:18 +02:00
Florian Staudacher
36e92b322f fix hovercard aspect selectio z-index by moving it out of the stream element 
- create handlebars template for hovercards
- fix notifications-dropdown (workaround) to remain open when aspect
  selector is clicked
 2014-09-01 19:39:23 +02:00
Jonne Haß
6df79f6983 so turns out whether an id is serialized to a json integer or string 
depends on the DB backend
 2014-08-30 22:15:05 +02:00
Jonne Haß
5d549f553b Escape person name in contacts json 
jQuery autoSuggest uses .html to insert it into the DOM
 2014-08-30 20:06:03 +02:00
Steffen van Bergerem
5a4697e254 Remove validation.js from mobile sign in page (fix regression) 2014-08-26 19:11:59 +02:00
lyzellis
8c90fea1e1 changes hovercard background color to grey on hover 2014-08-26 01:50:36 +02:00
Jonne Haß
52d5a1cd1a Merge pull request #5141 from svbergerem/mark-read-link-notifications 
Change mark read link on notifications page
 2014-08-24 13:32:32 +02:00
Jonne Haß
feb45a6291 Merge pull request #5135 from goobertron/tos2 
Minor formatting changes to ToS
 2014-08-24 13:30:51 +02:00
Jonne Haß
cf3d6293dc Merge pull request #5130 from wegotcoders/4948-add-linebreaks 
line breaks have been added to long headings
 2014-08-24 13:25:22 +02:00
Jonne Haß
28c247ef8b Merge pull request #5140 from svbergerem/refactor-css 
Refactor css
 2014-08-24 13:17:56 +02:00
Jonne Haß
527fb559e5 Bump version to 0.4.1.0 2014-08-24 13:17:29 +02:00
goobertron
0f2929a0ce Add strong codes for pod name 2014-08-23 19:40:02 +01:00
Steffen van Bergerem
c18df1c32f Change mark read link on notifications page 2014-08-23 17:42:19 +02:00
Jonne Haß
58927d1a9d bump sidekiq to 2.17.7 2014-08-23 16:03:17 +02:00
Steffen van Bergerem
d682821f2d Refactor css 2014-08-23 15:45:45 +02:00
Jonne Haß
c4970b485f Merge pull request #5131 from wegotcoders/3801_delete_own_photos 
3801 delete own photos
 2014-08-23 10:52:29 +02:00
Jonne Haß
18ead3e2e4 Merge pull request #5136 from svbergerem/fix-regression-login-css 
Fix mobile sign in page regression
 2014-08-22 00:22:07 +02:00
Steffen van Bergerem
987c982bb5 Fix mobile sign in page regression 2014-08-21 22:19:14 +02:00
goobertron
c8e5b326e5 Minor formatting changes to ToS 2014-08-21 11:36:21 +01:00
Jonne Haß
2b50001286 Merge pull request #5132 from svbergerem/remove-unused-login-js 
Remove unused js code for login page
 2014-08-19 18:05:21 +02:00
damzcodes
ab71205261 line breaks have been added in correct stylesheet 2014-08-19 14:51:42 +01:00
Daniel Sun
13419066d4 refactor authorIsCurrentUser to user model as isAuthorOf 
Dried up authorIsCurrentUser in views.js

removed authorIsCurrentUser, now called from views.js

remove authorIsCurrentUser from views.js
 2014-08-19 10:37:57 +01:00
op48
844fe9d6b9 Allow users to delete own photos from gallery 
Added delete label to photos in gallery

added an event to delete photos of current user

Added css for hiding/revealing the delete label

Included the photo stylesheet

Added cucumber test for deleting your own photos

Removed wip
 2014-08-19 10:11:06 +01:00
Steffen van Bergerem
9e32eb370a Remove unused js code for login page 2014-08-19 09:25:48 +02:00
Jonne Haß
8654e1b3ad remove unused variable in i18n.js [ci skip] 2014-08-18 21:09:57 +02:00
Jonne Haß
b582e1f707 i18n.js: Add interface to retrieve entire sections 
And make use of that in HelpView
 2014-08-18 21:06:52 +02:00
damzcodes
c58a56c5fe line breaks have been added to long headings 2014-08-18 14:06:07 +01:00
Jonne Haß
ec877e3784 Merge pull request #4978 from jhass/bump_acts_as_taggable_on 
Bump acts-as-taggable-on
 2014-08-18 12:20:19 +02:00
Jonne Haß
ae24495c7d Merge pull request #5127 from Raven24/hpetru-2875-ignore-user-posts 
Remove ignored peoples posts without refresh (II)
 2014-08-18 11:35:56 +02:00
Jonne Haß
ec02f54613 Merge pull request #5122 from jaideng123/5113-mark-as-read-by-filter 
Added Mark all in filter as read feature
 2014-08-18 11:30:18 +02:00
Jonne Haß
fa9c079955 Merge pull request #5121 from wegotcoders/4943-add-services-to-statistics-json 
Service have been added to /statistics.json
 2014-08-18 11:20:26 +02:00
Jonne Haß
d3b901801c Merge pull request #5111 from jaywink/user-mailer 
Rake task to send mails to users
 2014-08-18 11:18:25 +02:00
Jonne Haß
5cba051fd7 Merge pull request #5104 from jaywink/tos 
Terms of service and privacy policy feature.
 2014-08-18 11:15:57 +02:00
jaideng123
c68eeb70fb Added the button changing effect + the ability to read all of a type to mobile 2014-08-17 15:51:37 -05:00
jaideng123
406397988b Made wording more clear, refactored read_all 2014-08-17 11:16:30 -05:00
Jason Robinson
d0b37fa7ee Rescue from an exception when sending emails in podmin:admin_email 2014-08-17 18:14:36 +03:00
jaideng123
6456a441fe Modified behavior of mark all as read button 2014-08-17 10:12:23 -05:00
Jason Robinson
a4eafe8a87 Allow sending emails with custom subject via Notifier.admin 2014-08-17 18:02:16 +03:00
Jason Robinson
6dd1e31337 Rake task for Notifier.admin to send emails to users 2014-08-17 18:02:16 +03:00
Jason Robinson
e58f0b2ad4 Terms of service and privacy policy feature. 
If enabled, terms of service link will be shown in sign up page.
 2014-08-17 17:44:44 +03:00
Florian Staudacher
4fd9bae056 refactor global event broker and user blocking from stream posts 2014-08-17 14:05:56 +02:00
Jonne Haß
c45f84c3fa Merge pull request #5123 from svbergerem/remove-unused-code 
Remove unused code
 2014-08-16 13:31:11 +02:00
Steffen van Bergerem
022bc1007d Remove unused code 2014-08-16 11:47:31 +02:00
Jonne Haß
98c3a0a871 Merge pull request #5120 from jhass/i18n_js_fallback 
Add fallback system to frontend I18n system
 2014-08-15 15:07:24 +02:00
damzcodes
de069962b3 Service have been added to /statistics.json 
Services have been added to /statistics.json

tidying up

edits
 2014-08-15 14:02:03 +01:00
Jonne Haß
92a6fc9eb5 Add fallback system to frontend I18n system 
Load the default locale and fall back to it on missing key
and interpolation errors
 2014-08-15 13:53:28 +02:00
Jonne Haß
0127852936 Merge pull request #5112 from svbergerem/login-redesign 
Redesign login page

Conflicts:
	Changelog.md
 2014-08-15 11:44:05 +02:00