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

3095 commits

Author SHA1 Message Date
movilla
c0c568365a Fix blank page 404 on mobile 2012-09-04 00:09:45 +02:00
Florian Staudacher
45223fd634 Merge pull request #3520 from movilla/new_mobile_resgistrations_ 
New mobile page registrations, add an error message to registrations page, friendlier design, add placeholders and ().upcase
 2012-08-31 01:17:20 -07:00
Sean Tilley
3775deb03f Merge pull request #3525 from movilla/big_block_login_ 
Issue #3523: The text 'Gebruikersnaam' (unsername in Dutch) overlay the inputfield. [ci skip]
 2012-08-30 10:13:44 -07:00
movilla
6a32bdd570 Issue #3523: Overflow text username in Duych - maybe several language-_ 2012-08-30 16:03:35 +02:00
movilla
94525f5e45 Issue #3523: Overflow text username in Duych - maybe several language- 2012-08-30 15:55:54 +02:00
movilla
6c6be3e22a New mobile_web registrations 2012-08-29 23:09:52 +02:00
movilla
b1815c8e9a Add placeholder search mobile 2012-08-25 03:45:02 +02:00
Maxwell Salzberg
ac9af24209 Merge pull request #3505 from movilla/add_header_mobile_icons 
Add icon to search & contacts via mobile
 2012-08-22 10:40:02 -07:00
Maxwell Salzberg
4c9326eaf9 fix stupid sign up form 2012-08-21 15:42:07 -07:00
movilla
75402bdfa0 Add icons search & contacts mobile 2012-08-21 16:50:37 +02:00
movilla
e41ef3caa5 Small changes in mobile_style 2012-08-20 22:40:52 +02:00
movilla
9913f40a38 Added private conversation for mobile 2012-08-20 16:33:05 +02:00
Maxwell Salzberg
329a37ef9a Merge pull request #3493 from movilla/conversation_mobile 
Add file mobile conversation
 2012-08-14 11:08:41 -07:00
movilla
783edaa327 Fix issue #3473 Wrong profile icon size in tag stream 2012-08-12 23:23:16 +02:00
movilla
9931f39ce0 add mobile conversation 2012-08-12 05:01:42 +02:00
Florian Staudacher
645fa76b20 make the "last post" link show ownly if the person has any posts 
(fixes #3437)
 2012-08-09 15:12:22 +02:00
Florian Staudacher
932fb186e3 fix failing bookmarklet specs (wait for js to finish) 2012-08-04 16:10:11 +02:00
Florian Staudacher
9d11748486 added minimal layout for bookmarklet popup 2012-08-04 14:48:18 +02:00
Dennis Schubert
15b7ee0cf8 Fix the bookmarklet when using paramters 
... because setting values without waiting for the browser to finish the DOM rendering is evil ...
 2012-07-26 23:57:28 +03:00
Florian Staudacher
b9c4e8a02f let the 'toggle mobile' link show in the footer, refactored layout a bit 2012-07-22 15:25:51 +02:00
movilla
d45e53bb91 Link to post in the mobile 2012-07-22 13:32:02 +03:00
Florian Staudacher
629277502f Merge pull request #3450 from despora/mobile_messages 
add messages/conversations to mobile
 2012-07-16 15:10:00 -07:00
Lennart Prelle
00032a1649 add messages to mobile 2012-07-14 14:23:03 +02:00
Jason Robinson
e644a70406 Mobile bookmarklet was not loading jQuery causing javascript to not execute, fixes #3204 2012-07-10 23:06:42 +03:00
Florian Staudacher
038599bf8f update jquery.mentionsInput to latest version 
+ make some tests a little nicer
 2012-07-10 20:37:57 +02:00
Florian Staudacher
ea8f358a9a use unminified jQuery textchange plugin 2012-07-10 17:58:34 +02:00
movilla
2ff89ed33d Change root_url to root_path 2012-07-06 20:08:41 +03:00
Jonne Haß
c9e54700ff string concatenation is still bad 2012-06-24 12:21:52 +02:00
movilla
1417cd5b0f Last translation admin-panel (weekly user) 2012-06-24 02:34:49 +02:00
Florian Staudacher
994bfd4a24 fix client-side validations in registration form + test 2012-06-18 18:57:44 +02:00
Florian Staudacher
f4d7196fb5 tell jQuery not to expect html when deleting photos in the publisher 2012-06-18 15:25:50 +02:00
movilla
d5aefaa64c Login with pod_name 2012-06-16 22:51:38 +02:00
Steven Hancock
9280753950 Fix deprecation warning, :confirm option on links is deprecated 
Use `:data => { :confirm => 'text' }` instead.
 2012-06-14 01:56:51 -07:00
Steven Hancock
a8de3a5a3f Rails.root and File.join cleanup 
- `Rails.root` is a `Pathname`, so let's use `Rails.root.join`
- Clean up most of the remaining `File.join`s
 2012-06-11 03:13:20 -07:00
Florian Staudacher
8ca39f5936 show a "post is not public" message when visitor is not logged in 
and tries to access a show page of a non-public post
 2012-06-07 22:16:37 +02:00
Maxwell Salzberg
9071540400 use pod name helper in emails 2012-06-04 14:04:39 -07:00
Maxwell Salzberg
018e513130 remove disable_with depreciation warning. 2012-05-31 22:35:07 -07:00
Maxwell Salzberg
cf6974b898 fix photo uploader loading image 2012-05-31 11:58:11 -07:00
danielgrippi
9e42d4386f actually add the guid into the layouts [ci skip] 2012-05-30 16:34:29 -07:00
danielgrippi
de680216f0 add mixstuff to post.haml layout [ci skip] 2012-05-30 15:33:40 -07:00
danielgrippi
f3e568d3c1 actually include mixpanel. durr [ci skip] 2012-05-30 14:00:25 -07:00
danielgrippi
72d2f619fc added GA back into rack; added mixpanel configuration options 2012-05-30 13:30:28 -07:00
Maxwell Salzberg
82c4e0d577 add a podname app config var, and use it throughout the app 2012-05-30 12:11:59 -07:00
Maxwell Salzberg
234bb4cb56 Merge pull request #3302 from movilla/new_login 
Translation new make something /stream [ci skip]
 2012-05-29 11:45:24 -07:00
Carlos Alexandro Becker
22103ffe65 set cursor into username field on login page - fixes #3305 2012-05-28 01:40:30 -03:00
movilla
13c16af5ad Fix Translation missing Email_link 2012-05-26 21:49:54 +02:00
Maxwell Salzberg
de499ba276 new bookmarklet needs to be ridic wide to deal with bootstrap responsive :( [ci skip] 2012-05-23 18:06:50 -07:00
Dennis Schubert
348c5ac522 Extend usernames pattern to allow '@', '.' and '"' to not lock out old users with dots in their username or users using their email address to sign in... 2012-05-23 20:52:43 +03:00
movilla
a7f967c2c5 Translation new make something /stream 2012-05-23 00:43:45 +02:00
Jonne Haß
5c534521cc top level email is a noun, not a verb [ci skip] 2012-05-22 10:26:21 +02:00
Dennis Collinson
2059fea656 put stream.haml back as it is still used in mobile 2012-05-21 17:43:49 -07:00
Dennis Collinson
17dc5eab18 can't remove these yet, cause of mobile 
Revert "do you like old views, because I don't.Kill the old stream views"

This reverts commit 370d8b0482.
 2012-05-21 17:40:23 -07:00
Dennis Collinson
370d8b0482 do you like old views, because I don't.Kill the old stream views 2012-05-21 17:20:08 -07:00
danielgrippi
72f718c8c3 new login page. kept the old one for safe keeping. 2012-05-19 11:10:17 -07:00
Maxwell Salzberg
471ce309ea kill your darlings; remove diaspora_client with fire 2012-05-17 14:55:53 -07:00
Maxwell Salzberg
a6758c0832 Merge pull request #3264 from movilla/share_amparito 
Translation invitation Share this link /stream [ci skip]
 2012-05-16 17:48:14 -07:00
movilla
d394272e5d Translation invitation Share this link /stream 2012-05-16 00:56:34 +02:00
Movilla
4fac6c9619 Rebase Add translation app/views/admins/stats.html.haml => Admin Panel 2012-05-15 22:38:48 +02:00
Movilla
a3daa00a41 Rebase Add translation app/views/admins/stats.html.haml for Admin Panel 2012-05-15 22:27:08 +02:00
Maxwell Salzberg
ab2e740ca2 upgrade to Rails 3.2.3 2012-05-14 21:53:16 -07:00
Maxwell Salzberg
fe6dcffa8f remove cubbies from sidebar, also add invite code directly to sidebar to make even clearer 2012-05-14 16:33:56 -07:00
Maxwell Salzberg
06f389231a kill services users with fire. we need this feature, but we need to just start from scratch because this is redonkalonk 2012-05-14 16:25:19 -07:00
Maxwell Salzberg
7a6633e82a Merge pull request #3256 from SuperTux88/invitation-mail 
Invitation mail cleanup
 2012-05-14 15:38:43 -07:00
Benjamin Neff
e15aff46a6 delete message input field 2012-05-15 00:23:54 +02:00
Benjamin Neff
ea90c6caf0 remove "message" from invite-form (not used in email) 2012-05-13 02:51:54 +02:00
movilla
7538f89a95 Translation registrations/new 2012-05-12 22:18:10 +02:00
danielgrippi
81661c883f custom landing page logic for mobile. yay 2012-05-11 17:05:09 -07:00
danielgrippi
a3ca176d74 new getting started page [ci skip] 2012-05-10 20:43:00 -07:00
Maxwell Salzberg
eaedfc9827 create a new publisher using the new composer. only for beta users 2012-05-09 16:55:33 -07:00
danielgrippi
0ec364e44c DG MS; popup on services, inlined in the composer 2012-05-08 18:09:33 -07:00
Steven Hancock
56db268613 Use markerb for emails 
* Add markerb to the Gemfile
* Update mailer classes to send multipart text+html emails
* Simplify all email templates and convert to Markdown+ERB

This required stripping the CSS and images from the emails. All
Markdown templates are based on the original HTML version except
for the inviter, where it was much easier to work with the text
version (and the i18n contains the whole message anyway).
 2012-05-07 19:41:30 -07:00
danielgrippi
34819b4128 temp button instead of textbox for beta-limbo users 2012-05-07 15:40:13 -07:00
danielgrippi
a5f34e67c7 made favicon sexier; extracted form-block into its own custom class; made the title of pages less caps-lock. 2012-05-04 21:25:50 -07:00
danielgrippi
69b9b5768f yield outside container like in master 2012-05-04 17:40:47 -07:00
danielgrippi
511a87e830 remove unused file [ci skip] 2012-05-04 17:38:08 -07:00
danielgrippi
5821a84024 validations and all that jazz [ci skip] 2012-05-04 17:38:08 -07:00
danielgrippi
31af414a04 actually use labels, html5 validations, etc [ci skip] 2012-05-04 17:38:08 -07:00
danielgrippi
40347038f8 DG RY; mostly done, validations pending [ci skip] 2012-05-04 17:38:07 -07:00
Dennis Collinson
6fcba2dd4b preload javascript vars using gon 2012-05-04 15:17:32 -07:00
danielgrippi
feb19e304e add chartbeat to mobile [ci skip] 2012-05-03 16:05:57 -07:00
danielgrippi
004874eb89 Revert "adding custom landing page for heroku" [ci skip] 
This reverts commit 3b994f45e1.
 2012-05-03 14:13:24 -07:00
danielgrippi
7be7acdfd6 add chartbeat option for great success (and metrics) 2012-05-03 14:04:19 -07:00
danielgrippi
3b994f45e1 adding custom landing page for heroku 2012-05-03 14:04:19 -07:00
danielgrippi
f263d0309d spelling error. running cukes are important. 2012-05-01 18:27:24 -07:00
danielgrippi
fe49579ff5 remove google-analytics middleware due to the fact that it doesn't support injection of custom variables before _trackPageView is called (this results in custom vars not getting tracked) 
i've submitted an issue to the gem.  hopefully we can put it back in later… for now i've copy and pasted its output into a helper method.
 2012-05-01 18:02:25 -07:00
Sean Tilley
d15c7267c2 Merge pull request #3206 from movilla/reshare-flash 
Fix url "/logo_caps.png" mails [ci skip]
 2012-04-30 14:21:43 -07:00
movilla
bdc479636f Fix url "/logo_caps.png" 2012-04-30 18:29:26 +03:00
danielgrippi
c06e8b3329 track anonomous user segments via analytics (let's see how successful the beta channel features are) 2012-04-29 11:37:05 -07:00
danielgrippi
bbd4ee5738 correctly redirect for beta and admin users (profile vs stream homepages) 2012-04-28 15:09:02 -07:00
danielgrippi
193644b5c1 Revert "adding custom landing page for heroku" [ci skip] 
This reverts commit 6f951ac678.
 2012-04-26 17:57:54 -07:00
Maxwell Salzberg
6f951ac678 adding custom landing page for heroku 2012-04-26 16:45:46 -07:00
danielgrippi
6d866fa49d Revert "adding custom landing page for heroku" 
This reverts commit 2c9d84607a.
 2012-04-26 15:08:07 -07:00
danielgrippi
2c9d84607a adding custom landing page for heroku 2012-04-26 13:57:50 -07:00
movilla
cc329594c5 Add translation app/views/admins/user_search.html.haml - Admin Panel 2012-04-24 02:05:13 +02:00
Dennis Collinson
afc26c684b DC MS infinite scroll with isotope on new profile page. boom! 2012-04-22 16:46:39 -07:00
Dennis Collinson
ca33070b9e loader is background image of span 
fix tests
 2012-04-21 15:21:52 -07:00
danielgrippi
6d9dd1f4d3 skeleton in place. 2012-04-21 13:12:56 -07:00
Maxwell Salzberg
b4d50510f9 sorry aobut that [ci skip] 2012-04-20 10:40:22 -07:00
Movilla
7b203e3636 Better fix issue #3134 2012-04-20 16:07:31 +02:00
Maxwell Salzberg
5f839aa26f include modernizer in the mobile group so it works 2012-04-20 00:00:23 -07:00