Dennis Schubert
|
3f3148af2c
|
Merge branch 'stable' into develop
|
2015-05-10 02:00:41 +02:00 |
|
Steffen van Bergerem
|
1428369849
|
Mobile: Add button to follow/unfollow tags
|
2015-05-10 01:59:50 +02:00 |
|
Jonne Haß
|
4a7c358be9
|
Merge branch 'stable' into develop
|
2015-05-05 01:39:52 +02:00 |
|
Steffen van Bergerem
|
399fdb2c7d
|
Check request.format :mobile in home controller
|
2015-05-05 01:39:48 +02:00 |
|
Jonne Haß
|
234e205602
|
Merge branch 'stable' into develop
|
2015-05-04 03:38:44 +02:00 |
|
Steffen van Bergerem
|
a22127bfb1
|
Add ctrl+enter shortcut for conversations
|
2015-05-04 03:38:42 +02:00 |
|
Jonne Haß
|
8172eee43c
|
Merge branch 'stable' into develop
|
2015-05-04 03:31:34 +02:00 |
|
Steffen van Bergerem
|
1fc31cc313
|
Fix close account for mobile view
and use Bootstrap modal for desktop close account
|
2015-05-04 03:31:28 +02:00 |
|
Jonne Haß
|
f257658e46
|
Revert "Revert "Merge pull request #5852 from margori/3393-activity-stream-keeping-retracted-participations""
This reverts commit 2c7848e3cb.
|
2015-05-04 00:43:41 +02:00 |
|
Jonne Haß
|
2c7848e3cb
|
Revert "Merge pull request #5852 from margori/3393-activity-stream-keeping-retracted-participations"
This reverts commit 096fa2ddbb, reversing
changes made to f7d1105148.
|
2015-05-04 00:36:27 +02:00 |
|
Benjamin Neff
|
28c9cfdfd4
|
write cucumber test and add order_id on create
|
2015-04-28 02:38:28 +02:00 |
|
Jonne Haß
|
d959dd725b
|
Merge pull request #5850 from svbergerem/modal-for-new-aspect
Use Bootstrap modal for new aspect form
|
2015-04-20 22:34:51 +02:00 |
|
Marcelo Briones
|
6636a89118
|
Add participation counter
|
2015-04-11 14:41:17 -03:00 |
|
Asphyxia
|
5fb328864e
|
Activity stream keeping retracted participations
|
2015-04-10 21:46:42 -03:00 |
|
Steffen van Bergerem
|
75ef9f47d0
|
Use Bootstrap modal for new aspect form
|
2015-04-07 10:45:09 +02:00 |
|
Jonne Haß
|
ea58c95fa0
|
Switch back to database cleaner
database_rewinder seems to cause deadlocks in postgres and other
subtle bugs for us.
|
2015-03-25 13:37:56 +01:00 |
|
Jonne Haß
|
65a738e604
|
bump rspec-rails
|
2015-03-25 02:33:56 +01:00 |
|
Steffen van Bergerem
|
0856eb8f86
|
Merge pull request #5788 from AugierLe42e/fix-search-element-selection
Fixes #5787
|
2015-03-16 23:36:51 +01:00 |
|
Augier
|
571685d590
|
Fix the broken searchbar (#5787)
|
2015-03-16 22:07:51 +01:00 |
|
Steffen van Bergerem
|
d40cbd0b2b
|
Remove unnecessary 'on the home page' steps
|
2015-03-16 14:36:35 +01:00 |
|
Steffen van Bergerem
|
81cd1753e4
|
Improve link to original post in reshared polls
|
2015-03-15 17:07:16 +01:00 |
|
goobertron
|
2b6ca180ce
|
Add tests for liking and unliking posts
|
2015-03-14 14:50:35 +00:00 |
|
Steffen van Bergerem
|
2328f64d56
|
Merge pull request #5580 from MothOnMars/5549-password-reset-error
display specific error messages for password change (issue #5549)
|
2015-03-14 03:25:08 +01:00 |
|
Martha
|
985141c0e8
|
display specific error messages for password change (issue #5549)
|
2015-03-13 11:35:21 -07:00 |
|
Jonne Haß
|
cc585805ad
|
Merge pull request #5762 from svbergerem/entypo-controls
Use entypo for control icons
|
2015-03-12 19:29:40 +01:00 |
|
Steffen van Bergerem
|
af9d6ddab3
|
Use handlebars helpers wherever possible
|
2015-03-12 16:20:32 +01:00 |
|
Steffen van Bergerem
|
cb30ffc368
|
Use entypo for post control icons
|
2015-03-12 13:08:23 +01:00 |
|
Steffen van Bergerem
|
52c2a73d83
|
Merge pull request #5707 from AugierLe42e/port-notifications-backbone
[WIP] Port of notifications.js and notification-badge.js to Backbone part.1
|
2015-03-11 17:05:14 +01:00 |
|
Steffen van Bergerem
|
be175e969e
|
Fix mobile sign up with invitation
|
2015-03-11 10:52:42 +01:00 |
|
Augier
|
95f4675ddf
|
Port of notifications to Backbone
|
2015-03-11 02:11:05 +01:00 |
|
Steffen van Bergerem
|
73d04b706e
|
Use entypo icons for left navbar
|
2015-03-09 17:57:50 +01:00 |
|
Jonne Haß
|
0f2d2bd44d
|
Replace DatabaseCleaner with DatabaseRewinder
|
2015-03-02 15:02:57 +01:00 |
|
Steffen van Bergerem
|
c838389b67
|
Fix invitations and tests
|
2015-03-02 00:04:56 +01:00 |
|
Jonne Haß
|
8fd39d67f0
|
Rendering a file is no longer the default
|
2015-02-27 17:00:41 +01:00 |
|
Steffen van Bergerem
|
53714c4699
|
Fix notification for new conversations
|
2015-02-19 13:39:25 +01:00 |
|
flaburgan
|
2b19b4bfc9
|
Remove #sign-up-text, change placeholder text to lower-case, fix tests
|
2015-02-19 00:07:41 +01:00 |
|
flaburgan
|
1c231f3171
|
refactoring of the public pages design
|
2015-02-18 22:45:46 +01:00 |
|
Jonne Haß
|
34ad598cff
|
Merge pull request #5594 from Faldrian/4055-add_contacts_mobile
4055 add contacts mobile
|
2015-02-15 23:12:18 +01:00 |
|
Faldrian
|
8f3c03edfa
|
Added dropdown to add/remove people from/to aspects in mobile view
|
2015-02-15 22:08:15 +01:00 |
|
Jonne Haß
|
0af6fabfc7
|
Merge pull request #5650 from svbergerem/improve-hovercards-cuke
Make the hovercards cuke more reliable
|
2015-02-15 15:58:47 +01:00 |
|
arlogn
|
43a2a5c336
|
profile photos as thumbnails
|
2015-02-14 02:27:32 +01:00 |
|
Steffen van Bergerem
|
3db305264e
|
Make the hovercards cuke more reliable
|
2015-02-10 20:48:51 +01:00 |
|
goobertron
|
42cd2337be
|
Amend all text strings in en locales to use sentence case
Adapt cukes to work with new capitalisation rules
|
2015-01-31 17:44:57 +00:00 |
|
Faldrian
|
31c39a59d1
|
Added post moderation buttons in SPV
|
2015-01-25 05:11:59 +01:00 |
|
Faldrian
|
913d9827e7
|
Added support for environment-variable to specify firefox-binary for selenium-testing
|
2015-01-24 16:24:20 +01:00 |
|
Steffen van Bergerem
|
026773194a
|
Replace pagedown by markdown-it
|
2015-01-10 18:56:20 +01:00 |
|
flaburgan
|
3ff298606f
|
Add menu mobile and drawer navigation tests
|
2014-12-28 18:49:03 +01:00 |
|
Jonne Haß
|
c7047fbe8f
|
cleanup features/support
|
2014-12-08 04:55:56 +01:00 |
|
Jonne Haß
|
3a92efbfaf
|
drop deferred garbage collection
|
2014-12-08 04:51:06 +01:00 |
|
Jonne Haß
|
63e9d7b73f
|
Update aspect list checkmarks only after the stream was fetched
|
2014-12-05 03:18:30 +01:00 |
|