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

594 commits

Author SHA1 Message Date
Steffen van Bergerem
ff84ee0485 Small style changes, add tests 2014-08-26 22:45:43 +02:00
goobertron
9ee23017b8 Changelog note for change in jQuery CDN default 2014-08-26 16:37:45 +01:00
Jonne Haß
00de34ba38 Merge pull request #5129 from jaideng123/5106-scrolling_in_notifications 
Increased the number of notifications shown in drop down bar to 15

Conflicts:
	Gemfile.lock
 2014-08-26 02:06:55 +02:00
Jonne Haß
3b3a44b39b Merge pull request #5158 from khall/issue_5044 
Fix for issue 5044
 2014-08-26 01:18:39 +02:00
Jonne Haß
f772af86a6 Merge pull request #5156 from khall/issue_5040 
Fix for issue 5040
 2014-08-26 01:16:41 +02:00
Jonne Haß
cb6c79a885 Merge pull request #5151 from khall/issue_5090 
Fix for issue 5090
 2014-08-26 01:14:45 +02:00
Jonne Haß
2619beb157 Merge pull request #4481 from diaspora/rails4 
Port to Rails 4
 2014-08-24 13:42:31 +02:00
Jonne Haß
a1e547f8d7 Merge pull request #5105 from goobertron/jquery_default 
Change default for jQuery CDN to false
 2014-08-24 13:36:57 +02:00
Jonne Haß
3044195ebc Merge branch 'release/0.4.1.0' into develop 2014-08-24 13:34:29 +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ß
5c60f10022 start new development cycle 2014-08-24 13:28:02 +02:00
Jonne Haß
527fb559e5 Bump version to 0.4.1.0 2014-08-24 13:17:29 +02:00
Steffen van Bergerem
c18df1c32f Change mark read link on notifications page 2014-08-23 17:42:19 +02:00
Jonne Haß
d75632401b make everything boot again 2014-08-23 16:34:00 +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
Steffen van Bergerem
9e32eb370a Remove unused js code for login page 2014-08-19 09:25:48 +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
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
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ß
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
Pablo Cuadrado
5f80394801 changelog entry 2014-08-14 04:54:07 -03:00
Jonne Haß
0bc83b93e5 Merge pull request #5109 from wegotcoders/4886-auto-add-poll-answer 
4886 auto add poll answer
 2014-08-13 16:44:02 +02:00
Florian Staudacher
163b76ae3d Merge branch '2875-ignore-user-posts' of https://github.com/hpetru/diaspora into hpetru-2875-ignore-user-posts 
Conflicts:
	Changelog.md
 2014-08-13 14:30:28 +02:00
Jonne Haß
80a0a9f999 Merge pull request #5108 from blase/feature/5107-set-top-margin-on-body 
Set top margin only on the body element
 2014-08-07 10:59:38 +02:00
Jonne Haß
3f21593111 Merge pull request #5088 from goobertron/defaults 
Clarify explanations and defaults in diaspora.yml.example
 2014-08-05 21:52:09 +02:00
Jonne Haß
0421d9336a Merge pull request #5100 from Faldrian/feature/add_help_keyboard_shortcuts 
added keyboard shortcut help topic
 2014-08-03 20:12:15 +02:00
Jonne Haß
bd388d61e7 Merge pull request #5102 from Faldrian/feature/4474-fix_lightbox_thumbnails 
Feature/4474 fix lightbox thumbnails
 2014-08-03 20:10:20 +02:00
goobertron
49be5b82fe Clarify explanations and defaults in diaspora.yml.example 2014-07-31 11:42:18 +01:00
Jonne Haß
344cb55b06 Merge pull request #5083 from theatre-x/patch-3 
Change end year
 2014-07-30 19:11:05 +02:00
Jonne Haß
ddb80ad366 Merge pull request #5077 from svbergerem/bootstrap-people-search 
Port people search to Bootstrap

Conflicts:
	app/assets/stylesheets/application.css.sass
 2014-07-30 19:07:35 +02:00
Jonne Haß
6c6efd6e9a Merge pull request #5069 from TeamOmniaExtares/bugfix_remove_bootstrap_for_SPV_comments 
Bugfix remove bootstrap for spv comments Issue #4425
 2014-07-30 19:02:10 +02:00
Steffen van Bergerem
f615ad3115 Port people search to Bootstrap 2014-07-20 18:21:13 +02:00
Jason Robinson
ead86d3353 Add changelog entries for #5006 & #5009 [ci skip] 2014-07-14 22:12:26 +03:00
Jonne Haß
fe1d1bd7a8 Merge pull request #5056 from arlogn/login-podname-size-flexible 
Flexible font-size for huge text in sign_in page
 2014-07-07 09:03:48 +02:00
Jason Robinson
d26f9cfae7 Add changelog for mobile sign-in fix [ci skip] 2014-07-06 18:49:44 +03:00
Jonne Haß
25fac9a90f Merge pull request #5062 from mmn/develop 
Publish salmon endpoint URL in Webfinger XRD
 2014-07-06 16:56:34 +02:00
Jonne Haß
2fcb16de99 Merge pull request #5057 from blase/feature/4466-port-getting-started-page-to-bootstrap 
Port Getting Started page to Bootstrap
 2014-07-04 19:31:53 +02:00
Jonne Haß
0515c33769 Use double quotes when embeding translations in JS 
Translations commonly include single quotes, which closes
the JavaScript string unexpectedly. Closes #5055
 2014-07-03 22:57:42 +02:00
Florian Staudacher
13b716a449 allow admins to close user accounts from the backend 
* thanks to @maxwell for the initial work on this

port admin pages to bootstrap
* improve user view on admin search page
* add 'close account' link to each user in the search results
* keep the same blue color for the admin menu

some refactoring of the routes and the admin code
* try to be more RESTful (possibly)
* use a 'UserSearch' model for search parameters and querying

add changelog entry
 2014-07-01 23:33:15 +02:00
Jonne Haß
5a3d329703 Merge pull request #5049 from kpcyrd/aspect-edit-fix 
Fix broken aspect-edit sidebar update

Conflicts:
	app/assets/javascripts/aspect-edit-pane.js
 2014-07-01 14:49:53 +02:00
Jonne Haß
12c507d6a2 Merge pull request #5048 from kpcyrd/fix-5031 
Fix self-xss issue in contact-group-rename
 2014-07-01 14:44:41 +02:00
Jonne Haß
6fb6a08980 Merge pull request #4945 from hpetru/notifications 
Refactoring Notification#notify
 2014-07-01 14:33:54 +02:00
Jonne Haß
47b7434263 update changelog [ci skip] 2014-07-01 14:31:00 +02:00
Hincu Petru
1d09978440 Fix hidding of poll publisher for close action 2014-06-25 10:54:00 +00:00
Hincu Petru
653612b74d Remove posts for ignored person 2014-06-25 08:56:12 +00:00
Jason Robinson
b246c7b5ef Merge branch 'master' into develop 2014-06-24 22:26:20 +03:00