Commit graph

3420 commits

Author SHA1 Message Date
Steffen van Bergerem
f1408a7a09 Add contacts search and port aspect membership save/destroy to backbone 2014-08-26 21:41:11 +02:00
Steffen van Bergerem
9587961883 Display all contacts in the contact list 2014-08-26 21:41:02 +02:00
Steffen van Bergerem
6461135bfd Redesign contacts page 2014-08-26 19:18:32 +02:00
Jonne Haß
e3dc82bdcd Merge branch 'release/0.4.1.0' into develop 2014-08-26 19:12:14 +02:00
Steffen van Bergerem
5a4697e254 Remove validation.js from mobile sign in page (fix regression) 2014-08-26 19:11:59 +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
khall
1d0446fcab Adding tabindex='0' attributes to non-blueprint view elements since blueprint is so last week 2014-08-25 15:50:53 -07:00
Jonne Haß
42b08e8ab8 Update to Rails 4.1 2014-08-25 17:37:02 +02:00
khall
049e504ad3 Fix for issue 5044: Adding tabindex attributes for add contact dropdown and contents, also binding keypress event to perform same action that click does. 2014-08-24 21:37:39 -07: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ß
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ß
0a70a125be Remove deprecation warning in blueprint view 2014-08-24 01:02:35 +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ß
1b3a2185eb Fix and simplify current_page? check on profile page 2014-08-23 16:38:57 +02:00
Jonne Haß
76c6d95a0e replace deprecated disable_with option 2014-08-23 16:34:01 +02:00
Steffen van Bergerem
d682821f2d Refactor css 2014-08-23 15:45:45 +02:00
goobertron
c8e5b326e5 Minor formatting changes to ToS 2014-08-21 11:36:21 +01: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
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
jaideng123
6456a441fe Modified behavior of mark all as read button 2014-08-17 10:12:23 -05: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
Steffen van Bergerem
0d064cbefe Redesign login page 2014-08-15 00:46:20 +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
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
Pablo Cuadrado
83b1682750 removed border in tags, checkboxes centered inside the well classes 2014-08-14 04:53:20 -03:00
Pablo Cuadrado
beb795e3b3 elements are centered within the grid 2014-08-14 04:53:20 -03:00
Pablo Cuadrado
a6998c23b7 narrower settings pages 2014-08-14 04:53:20 -03:00
Pablo Cuadrado
39ae80027a profile birthday proportional selects (using responsive classes) 2014-08-14 04:53:20 -03:00
Pablo Cuadrado
1662814333 Narrower content for settings pages (2/3 of available width). 2014-08-14 04:49:50 -03:00
Pablo Cuadrado
c6511c9299 services edit page ported to bootstrap 2014-08-14 04:49:50 -03:00
Pablo Cuadrado
2611747875 privacy settings page ported to bootstrap 2014-08-14 04:49:49 -03:00
Pablo Cuadrado
9e34887712 profile edit page ported to bootstrap 2014-08-14 04:49:49 -03:00
Pablo Cuadrado
855597541a user account edit page fully ported to bootstrap 2014-08-14 04:49:49 -03:00
Błażej Pankowiak
255b8c02a2 Set top margin only on the body element 2014-08-07 00:15:17 +02:00
Jonne Haß
344cb55b06 Merge pull request #5083 from theatre-x/patch-3
Change end year
2014-07-30 19:11:05 +02:00
theatre-x
bf479f6715 Change end year
Changed to 1910. So people like THIS: https://en.wikipedia.org/wiki/Jacque_Fresco#Early_life can actually use Diaspora.
2014-07-20 20:31:14 -04:00
Steffen van Bergerem
f615ad3115 Port people search to Bootstrap 2014-07-20 18:21:13 +02: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
arlogn
2394c3df39 flexible font-size for sign_in podname huge text 2014-07-06 19:18:21 +02:00
Mikael Nordfeldth
65e7840085 Publish salmon endpoint URL in Webfinger XRD
Specification in Panzer draft for Salmon, paragraph 3.3 mentions:
   "The 'salmon' link relation may specify a Salmon endpoint used to notify
    a resource, typically a user account, about external mentions of that
    resource. For a user account, the salmon mention link SHOULD appear in
    the Webfinger [Webfinger] XRD document for the user account."

Source:
http://salmon-protocol.googlecode.com/svn/trunk/draft-panzer-salmon-00.html#SMLR
2014-07-06 15:05:51 +02:00
Dennis Schubert
4a2836b108 Remove stylesheet tag from mobile sign_up template 2014-07-05 00:39:39 +02:00
Błażej Pankowiak
0d0ed4db28 Port Getting Started page to Bootstrap 2014-07-04 18:06:49 +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