Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
36,460 Commits 28 Branches 143 Tags 605 MiB
Commit Graph

36460 Commits

Author SHA1 Message Date
Jessica McKellar d85c0d6ad8 Suppress displaying the 'r' in the content box on r-to-start-composing-zephyr. 
(imported from commit 1216b3739737a9dbf203fe105b16c6672bccd272)
 2012-08-29 17:09:33 -04:00
Jessica McKellar ebb08446e2 When you hit 'r', only try to start a zephyr if you weren't in the middle of one. 
(imported from commit 36779bf955e28c3a10713829e93cd207fbbb36f3)
 2012-08-29 17:08:16 -04:00
Jessica McKellar a8fa6b156a Turn newlines into linebreaks. 
(imported from commit 67999641a8cff471be1430e421f259b1c558444d)
 2012-08-29 16:47:53 -04:00
Keegan McAllister 13ee85f886 Enforce minimum height for main_div 
(imported from commit 291e5e0fc8680db63dec55b7339c4fe72d6acb76)
 2012-08-29 16:32:12 -04:00
Keegan McAllister a0e59fbbc9 Narrow on all personals together 
(imported from commit 2dc2646344767acbda7f1d8d6f847f8a69d597cf)
 2012-08-29 16:23:56 -04:00
Keegan McAllister 452b218ab6 Hide personals when narrowing on class or instance 
(imported from commit 1bd5a8ea05fcb6e3d8c7b68821faa9664cf5586b)
 2012-08-29 16:02:26 -04:00
Keegan McAllister 03a087a654 Rework display of personals 
Code cleanup, and add an arrow to indicate sender and recipient

(imported from commit 24881ee1e5f3bc9209f9ec485195dcd7178d86fb)
 2012-08-29 15:53:38 -04:00
Keegan McAllister 6e88482977 Remove debugging code 
(imported from commit 6e128f9f97fd433464bf14fc728d577e7e4fa0e4)
 2012-08-29 15:40:30 -04:00
Keegan McAllister 053122c3d1 Drop the responsive navbar 
(imported from commit 9ccf5a2f43242f35e510adab58ac6ca4715bceec)
 2012-08-29 15:40:10 -04:00
Keegan McAllister aca034b29d Fix capitalization 
(imported from commit c8bb901bcba58c760bde290bfe8b3eb2fe125e23)
 2012-08-29 15:40:10 -04:00
Keegan McAllister 6832fa9489 Use 'BLACK RIGHT-POINTING TRIANGLE' for the 'selected' indicator 
(imported from commit 713b24521f080e7772991d2d9808324ef6219ac5)
 2012-08-29 15:40:10 -04:00
Keegan McAllister 738ed46941 Factor out the HTML for #selected 
(imported from commit 2de461dca6ee22bcb701e0c5c2ec49bbcad496e4)
 2012-08-29 15:40:09 -04:00
Keegan McAllister 6cdbe914c4 Style the send buttons 
This happens automatically in Chrome, but not in Firefox.

(imported from commit 95c9d1e6110cdc51e6c97f743e8078ac262498bc)
 2012-08-29 15:40:09 -04:00
Keegan McAllister a2777eaed4 Resize main_div to exactly take up remaining vertical space 
Unfortunately, it's not so easy to do this with CSS only.

(imported from commit 93b58a53e20aae9ee651aa66b3163f68549a3982)
 2012-08-29 15:40:09 -04:00
Keegan McAllister a1d852d124 Jump to personals tab on prepare_personal 
(imported from commit 5f3fbc7a84a0af6742ceb1f1ab8806234870445f)
 2012-08-29 15:40:09 -04:00
Keegan McAllister 395001d8db Indicate narrowing 
(imported from commit 19682fc07393f0848481abf72339eefd56b30ab2)
 2012-08-29 15:40:09 -04:00
Keegan McAllister 1b587fc2c6 Style class / instance / username labels 
(imported from commit 2e0c9d72aa17971bdc12750dad62a59c46f646f1)
 2012-08-29 15:40:09 -04:00
Keegan McAllister 8948b21758 Restyle unhide button 
(imported from commit c668f19a581fa111dabdba5b1304922c7387c5dd)
 2012-08-29 15:16:28 -04:00
Keegan McAllister 5bf0c7be8e Move Zephyr input tabs to the bottom 
(imported from commit 646792708f18bf7504147996e63a52cada28be0d)
 2012-08-29 15:16:28 -04:00
Keegan McAllister 3e45bd2ccc Use a Bootstrap alert class on failed login 
(imported from commit d0e0048e4f3b99f9e2512c8b7f7249b6fa5201a3)
 2012-08-29 15:16:28 -04:00
Keegan McAllister 3ef5334d9b Focus username field on loading login/register pages 
(imported from commit 004a98ffaa59aebab34057cbe34f5e1038e44b62)
 2012-08-29 15:16:28 -04:00
Jessica McKellar 1f56ac9e60 Make the zephyr highlighting for new zephyrs consistent with those on page load. 
(imported from commit 28dbdb564b4dff479af1f71551a393f8dd54d597)
 2012-08-29 14:54:00 -04:00
Jessica McKellar a7c61d5568 Add subscriptions to the test data. 
(imported from commit 9332af496358b90e2a982e77017c9e8beef90d21)
 2012-08-29 12:57:26 -04:00
Jessica McKellar 1394a685e2 Only display zephyrs from your subscriptions. 
That means your personals, classes to which you are subscribed, and
personals you sent to other people.

(imported from commit 15fbea92b538ff345f9978438c1c5e66766d0a67)
 2012-08-29 12:57:26 -04:00
Tim Abbott cc01ad04bf Move javascript into its own file. 
(imported from commit b0e9a5e2700e85f31f8cd5922ab489000c96781c)
 2012-08-29 12:04:57 -04:00
Jessica McKellar 018c62829a Give our models meaningful reprs. 
>>> from zephyr.models import UserProfile, Recipient, Zephyr, ZephyrClass
>>> for klass in [UserProfile, Recipient, Zephyr, ZephyrClass]:
...     print klass.objects.all()[:2]
...
[<UserProfile: othello>, <UserProfile: iago>]
[<Recipient: Verona (1, class)>, <Recipient: Denmark (2, class)>]
[<Zephyr: Scotland / Scotland3 / <UserProfile: prospero>>, <Zephyr: Venice / Venice3 / <UserProfile: iago>>]
[<ZephyrClass: Verona>, <ZephyrClass: Denmark>]

(imported from commit 9998ffe40800213a5425990d6e85f5c5a43a5355)
 2012-08-29 10:45:20 -04:00
Jessica McKellar a35c5d30d7 zephyr.views: Add missing timezone import. 
(imported from commit b10066c7212850898fa7adede5d6d6be0fb6bea1)
 2012-08-29 10:19:10 -04:00
Keegan McAllister 5e59c79d1d Tab between class and personal message 
(imported from commit f7ce9eebc8fe75ad0fcfd0f60dde9ae117681134)
 2012-08-28 19:09:48 -04:00
Keegan McAllister 2f2bb1b9c1 Some content for accounts_home 
(imported from commit f42c0ee74a69d2668a1f77b1180c4e1ccb1def0c)
 2012-08-28 19:09:48 -04:00
Keegan McAllister 473de4eb2a New layout 
(imported from commit d44db3acf1d4c6a7b42a54aff9720bb86d01a754)
 2012-08-28 19:09:48 -04:00
Keegan McAllister 9849cc91e9 Move bootstrap.js and jQuery into head 
(imported from commit 8deddd6178f5612be275509bea0a23d20fb4693c)
 2012-08-28 18:36:55 -04:00
Keegan McAllister 54622c9101 Create zephyr.css 
(imported from commit 56c698496ba5cc59aeed4902dfee7bcfa248ffcf)
 2012-08-28 18:36:55 -04:00
Keegan McAllister c454718f3a Add log out link 
(imported from commit 89e489d5b96ba7ae02c77a384b4dfabaa9b28785)
 2012-08-28 18:36:55 -04:00
Keegan McAllister f88882f9a2 Basic Bootstrapification 
(imported from commit 54871fadcb5670a1ed3a68156b282bde1b50363f)
 2012-08-28 18:36:55 -04:00
Keegan McAllister d8e29c3ffe Serve static files 
(imported from commit 143e6273d660ccc54fd1d5170e9d180e82fed5f0)
 2012-08-28 18:36:55 -04:00
Keegan McAllister 098618df72 Add Bootstrap to base.html 
(imported from commit fe05c9a68b5ea352a191f29292defb99dff136d7)
 2012-08-28 18:36:55 -04:00
Keegan McAllister 1490ae1855 Add Bootstrap 
(imported from commit a5936ac9752931c797bef8a13517f3ebc0a73063)
 2012-08-28 18:36:55 -04:00
Keegan McAllister 316b32ef31 Make base.html more valid 
(imported from commit 07ae94e9678deca71b2b6933df4c4503cda96be5)
 2012-08-28 18:36:55 -04:00
Keegan McAllister 3e5b9e93c5 Add gitignore 
(imported from commit 9b136fed5171a43d96372e64c03772d07d5141a9)
 2012-08-28 18:36:55 -04:00
Tim Abbott 23af7f09ec Remove unnecessary create_user_profile argument. 
Signed-off-by: Tim Abbott <tabbott@humbughq.com>

(imported from commit 0b12743f8b1b9c2bcfe8444b3e025d31b704bb12)
 2012-08-28 17:40:09 -04:00
Tim Abbott 74219b5e08 Move the message display code out of get_updates(). 
(imported from commit 9de20dbd11156cd98a11c736991945cba12b8118)
 2012-08-28 17:38:36 -04:00
Tim Abbott 9625c17473 Change the last message received variable name to 'last_received'. 
(imported from commit 37c34b54ce4bcbf601f934854c8e77340ba69117)
 2012-08-28 17:38:36 -04:00
Jessica McKellar 36cc0219d5 Make timestamps on zephyrs timezone-aware. 
This will avoid Daylight Saving Time issues and resolves a Django
warning about using naive datetime objects ("RuntimeWarning:
DateTimeField received a naive datetime").

This adds a dependency on python-tz.

https://docs.djangoproject.com/en/dev/topics/i18n/timezones/

(imported from commit 10e432a67e2bcd014a0cedf4423a162609873825)
 2012-08-28 17:08:38 -04:00
Jessica McKellar 7b40df9e8b Also clear the Recipient table before populating the test database. 
(imported from commit e87baf72a40f3c22a6710ce2d05881673fa052d7)
 2012-08-28 16:57:45 -04:00
Jessica McKellar 5dd9616f51 Add a 'clear_db' management command to drop our tables (zephyr + sessions). 
(imported from commit 5763983689448944bed13feeeae9a482908a7aff)
 2012-08-28 16:56:32 -04:00
Jessica McKellar 4a6402f23c Use the correct MIME type for the JSON we are sending and receiving. 
http://www.ietf.org/rfc/rfc4627.txt
http://www.iana.org/assignments/media-types/application/index.html

(imported from commit d37e46a9db5077e2c7b1f39534875216df237e3c)
 2012-08-28 16:46:02 -04:00
Jessica McKellar f6819d09d5 Add basic personals functionality. 
(imported from commit a4fecbe40672f34295b1e908526b6c45056bcb7f)
 2012-08-28 16:35:04 -04:00
Jessica McKellar 2b9a3205be Switch zephyrs to the notion of a "Recipient", which is either a class or user. 
(imported from commit edc46267dab9cc972358b6020ca28b009e15d8c5)
 2012-08-28 16:34:23 -04:00
Tim Abbott 75ae3a3ac5 Add basic setup-server script. 
(imported from commit d3f0ef6101ec43807b852b9496384af976cf5325)
 2012-08-28 12:45:39 -04:00
Jessica McKellar 67212f2e7a Add manage.py (oops). 
(imported from commit ee314b56312527adcd13e08cd515c3e643cfee2e)
 2012-08-28 12:45:35 -04:00