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

14614 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonne Haß
467df1df77 generate binstubs 2014-08-23 16:34:00 +02:00
Jonne Haß
59d60ff947 remove strong_parameters initializer 2014-08-23 16:34:00 +02:00
Jonne Haß
55f40a2b65 update to rails 4 2014-08-23 16:33:53 +02:00
Jonne Haß
58927d1a9d bump sidekiq to 2.17.7 2014-08-23 16:03:17 +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
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
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
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
Jonne Haß
691594e0fd Merge pull request #5119 from svbergerem/people-search-fix-aspect-membership 
Fix aspect membership dropdown on people search page
 2014-08-15 03:22:54 +02:00
Jonne Haß
f82a5ba4d5 Merge pull request #5118 from blase/feature/4466-port-everything-to-bootstrap 
Port everything under /contacts to bootstrap
 2014-08-15 02:35:34 +02:00
Steffen van Bergerem
0d064cbefe Redesign login page 2014-08-15 00:46:20 +02:00
Steffen van Bergerem
ae3dec0167 Fix aspect membership dropdown on people search page 2014-08-15 00:16:11 +02:00
Błażej Pankowiak
b085c98b67 Update features to play nice with Bootstrap 2014-08-14 23:26:59 +02:00
Błażej Pankowiak
7ff0776d59 Move color to it's real home 2014-08-14 21:54:24 +02:00
Błażej Pankowiak
ede042f6cd Make new aspect popup Bootstrap compatible 2014-08-14 21:09:58 +02:00
Błażej Pankowiak
f085436160 Port aspect edit pane to Bootstrap 2014-08-14 21:09:58 +02:00
Błażej Pankowiak
2424301112 Port Community Spotlight to Bootstrap 2014-08-14 21:09:58 +02:00
Błażej Pankowiak
19bcf103aa Style selected aspect 2014-08-14 21:09:58 +02:00
Błażej Pankowiak
64537f8763 Center remove buttons vertically 2014-08-14 21:09:58 +02:00
Błażej Pankowiak
d0cbde2394 Style aspect controls 2014-08-14 21:09:58 +02:00
Błażej Pankowiak
0ad658f98c Port main Contact page to Bootstrap 2014-08-14 21:09:57 +02:00
Jonne Haß
7f3ff6bacb Merge pull request #5039 from pablocubico/feature/4466-new-bootstrap-config-profile-page 
[NEW] [WIP] #4466 Port settings pages to Bootstrap (edit profile, edit account, privacy, services)
 2014-08-14 19:20:15 +02:00
Pablo Cuadrado
5f80394801 changelog entry 2014-08-14 04:54:07 -03:00
Pablo Cuadrado
a74a02929d max-width for profile avatar 2014-08-14 04:53:20 -03:00
Pablo Cuadrado
83b1682750 removed border in tags, checkboxes centered inside the well classes 2014-08-14 04:53:20 -03:00