Jannik Streek
04199837b3
poll creation done
2014-03-31 18:14:07 +02:00
Jannik Streek
dfbe17d046
Poll input fields and data model now available
...
question field of poll now in db
fixed merge issues
2014-03-31 18:14:06 +02:00
Steffen van Bergerem
eabdc7390c
Port aspect membership dropdown and hovercards
2014-03-19 17:54:22 +01:00
Steffen van Bergerem
f217a5bc11
Add filters to notifications controller
2014-03-19 17:54:22 +01:00
Jonne Haß
d4e046ecbc
Merge pull request #4787 from hincupetru/4726-infinite-photo-stream
...
Added limit by max_time to photos#index for prevent "infinite photo stream"
2014-03-15 19:07:48 +01:00
Hincu Petru
e0b23b2dc4
Fixed #4726 infinite photo stream
2014-03-12 22:22:24 +00:00
Steffen van Bergerem
0cc3b10b1f
port publisher and bookmarklet to bootstrap
2014-03-10 15:15:40 +01:00
Fabian Rodriguez
8d8d3c649a
remove aspect sorting logic
2014-02-23 16:48:47 +01:00
goobertron
2a145e67ab
Update design of forgot_password and change_password forms
...
Fix redirect to stream, make labels lower-case
Fix cuke
2014-02-09 15:48:06 +00:00
goobertron
7bcea07b99
Standardise - code refs to 'messages' to 'conversations'
2014-02-09 15:44:12 +01:00
Jonne Haß
9ea6e9c166
Merge pull request #4517 from Zauberstuhl/report_post_feature
...
Added post reporter feature
Conflicts:
Changelog.md
app/assets/stylesheets/application.css.sass
db/schema.rb
2014-01-20 10:03:45 +01:00
Lukas Matt
5c9a3aaf3e
Added post report feature
...
You can report a single post by clicking the correct icon in the controler section
Workflow:
* Report a post as offensive
* Trigger alerts to every pod-admin
* Pod-admin can review it in the admin interface
* Delete the post or mark it as reviewed
2014-01-14 15:00:55 -05:00
Jonne Haß
42f790fa13
Merge pull request #4666 from jaywink/signup-form-error-redirect
...
Instead of redirect on signup form validation, render new
2014-01-11 14:08:18 -08:00
Jason Robinson
35ece9d65f
Instead of redirect on signup form validation, render new with submitted data.
2014-01-06 22:12:07 +02:00
maruf
c17a474142
Simple captcha for signup page
2014-01-06 22:00:37 +02:00
Steffen van Bergerem
55b967caf9
remove participants popover + improve conversations menu
2014-01-01 21:58:56 +01:00
Steffen van Bergerem
24310fe5a9
change layout
2013-12-15 20:14:55 +01:00
Steffen van Bergerem
c11b744a7f
port conversations view to bootstrap
2013-12-15 13:01:24 +01:00
Fabian Rodriguez
c12a45556d
fix #2645
...
* refactor a bit #weekly_user_stats
* pass 0 instead of "" to i18n
* use the first week if none is provided
2013-12-13 19:32:04 -02:00
Jonne Haß
c660c90091
Merge pull request #4612 from diaspora/drop_spv_old_code
...
Drop spv old code
2013-12-11 07:41:51 -08:00
Jason Robinson
2c83d0e846
Statistics route with general info, some user and total posts stats. By default statistics off, enabled in settings.
2013-12-02 22:35:18 +02:00
Fabian Rodriguez
92db8cb929
remove #next and #previous from posts_controller
2013-12-01 20:55:48 -02:00
Florian Staudacher
1c4ad0986c
refactor message creation (conversations)
2013-10-20 22:46:53 +02:00
Florian Staudacher
830747a11e
refactor conversations_controller#create
2013-10-10 21:42:46 +02:00
Florian Staudacher
260d86d501
refactor ConversationsController, move query builing to User model
2013-09-30 01:44:57 +02:00
Steffen van Bergerem
324b09a72a
add help page
2013-08-26 15:26:18 +02:00
Jonne Haß
f9a3990562
do not leak photos through photos#show
2013-08-26 09:39:39 +02:00
Jonne Haß
1b7bc02eee
Merge pull request #4410 from rogerbraun/feature/spv-redesign
...
New single post view
Conflicts:
app/assets/stylesheets/application.css.sass
2013-08-22 10:37:25 +02:00
Jonne Haß
0012a82f48
add the footer to the SPV
2013-08-22 09:56:36 +02:00
flaburgan
d63dc9f0a5
Add images, fix layout rendering
2013-08-22 09:56:34 +02:00
flaburgan
abba8d8dfc
Add header to the single post view
2013-08-22 09:56:34 +02:00
Jonne Haß
554d0a93d0
Do not leak photos in the profile sidebar
2013-08-20 20:56:37 +02:00
Steffen van Bergerem
f22b4d7da7
Change contact list on profile page
2013-08-19 14:02:08 +02:00
mokus
8df8855ac0
remove the limit 3 for @photos in photo controller
2013-08-19 12:49:38 +02:00
carolina
d7e6ec8a4c
Add photo count
2013-08-19 12:49:38 +02:00
carolina
9a5691c46a
Add to leftsidebar link to photos index + thumbnails from last 3 photos
2013-08-19 12:39:51 +02:00
movilla
d1c679cc22
remove comments from the mobile site. Close #4225
2013-08-16 22:14:52 +02:00
movilla
77c4731157
fix layout on the registration page for mobile
2013-08-14 13:52:52 +02:00
Oliver Azevedo Barnes
4b516603f7
Fix #4361 twitter access level check breaking facebook addition to user
...
Rewrite twitter access-level check
Fixed tests, still working on getting facebook up
Add heroku example to diaspora.example.yml
2013-08-12 13:17:18 -05:00
movilla
152c08963a
fix mobile search tags
2013-08-12 16:01:26 +02:00
Jonne Haß
14c78da6cd
whitelist getting_started as a user settable attribute, fixes #4378
2013-08-11 16:52:54 +02:00
Oliver Azevedo Barnes
452301b34d
Fix #4361 twitter access level check breaking facebook addition to user
2013-08-07 18:59:49 -05:00
Jonne Haß
a2e5f1f88e
Merge pull request #4335 from Team-D/feature/4169-tag_search_autocomplete
...
#4169 tag search autocomplete
2013-08-06 13:29:12 -07:00
Jonne Haß
efbd3c8605
Merge pull request #4344 from oliverbarnes/4124-check-twitter-write-access-before-auth
...
Issue #4124 Check write access before authorizing Twitter
2013-08-06 21:21:56 +02:00
Oliver Azevedo Barnes
55a58713a5
Issue #4124 Check write access before authorizing Twitter
2013-08-05 13:52:19 -05:00
mokus
df9a42c397
update search controller + serch.js so that autocomplete works
...
Added search_controller_spec, moved some tests from people_controller_spec to search_controller_spec
Fixed merged conflict in Changelog
update routes and search controller
remove useless except from search controller
Fix indentation in search_controller
2013-08-05 11:49:23 +02:00
James Fleming
9ca9a6f310
Remove duplicates and bad code habits.
...
Remove some blank line.
Do not chain bang methods.
2013-08-02 11:39:24 +02:00
James Fleming
94e9fc5ac4
Use strong params in profiles_controller
2013-08-02 11:39:06 +02:00
James Fleming
d6ba6d1b02
Use strong params in photos_controller
...
Add specs to check mass-assignment gotchas in PhotosController.
2013-08-02 11:39:05 +02:00
James Fleming
0e26a496b8
Strong parameters for User
...
Fetch user params instead of require.
2013-08-02 11:39:04 +02:00
