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

84 Commits

Author SHA1 Message Date
Keegan McAllister db7a8277ff Replace create_{user_profile,zephyr_class} with {UserProfile,ZephyrClass}.create 
Looks nicer and cuts down on imports.

(imported from commit 4fdbbb45cf6d8ad016481c663cf52fd555b41d91)
 2012-09-19 13:01:58 -04:00
Keegan McAllister 8aded489b8 Remove a duplicated query 
(imported from commit 50ee95e0ec887d5a9d1629051aa816c706bd04d8)
 2012-09-18 14:24:52 -04:00
Jessica McKellar a8484cb967 Remove subscriptions with an AJAX request. 
(imported from commit d34154b31a38ac66cc8f97785c312c98dd53286c)
 2012-09-18 12:33:07 -04:00
Jessica McKellar 2126e38ae2 Get and display new subscriptions with an AJAX request. 
(imported from commit c9efa7596898ac4b74ec9184ae773566eda65ec3)
 2012-09-18 12:32:52 -04:00
Jessica McKellar 1996efa0c7 Give json_success/error the ability to add more data to the results json. 
(imported from commit 8fafb983f30e193905616eafa3be2f8aec1143c3)
 2012-09-18 12:26:29 -04:00
Keegan McAllister c53470c908 Sanitize username, class name, etc 
(imported from commit 95730f1f725036649ff60d698b461fdcf33594bb)
 2012-09-17 15:24:41 -04:00
Keegan McAllister 7152fe2f73 Format messages with Markdown 
(imported from commit 014a4dddd4d3db61d85c6f6bf1987aff6093fb52)
 2012-09-17 15:24:41 -04:00
Luke Faraone de5ff99c21 Don't generate both zephyr_json and zephyr_dict_json on the server. 
Previously we were iterating through all zephyrs twice on the server, now
we are moving part of that to the client so the client has an index of
Zephyrs that it generates itself as part of add_message.

(imported from commit c07a6c36911fa2eae6f216c34331be34b2aa8178)
 2012-09-17 13:12:22 -04:00
Jessica McKellar a12f582d92 Don't let people try to send zephyrs to empty class names. 
Also strip leading and trailing whitespace, so 'Bar' and 'Bar' aren't
separate classes.

(imported from commit a39c220d1a4c4d179f4adbf5e1391436eda32f4f)
 2012-09-14 15:44:54 -04:00
Luke Faraone 4821175dd5 Provide both a sequential list of zephyrs and an associative array. 
The purpose of this is to ensure that we can reference a zephyr by its ID
and get all the data about the zephyr; in the future we may not have all
such data stored in TRs as we do now.

(imported from commit 9128ddd01b46396fd276124ca1e6430538d3dd63)
 2012-09-13 14:31:02 -04:00
Keegan McAllister 96abc04fe6 Set email on forged users 
(imported from commit ee7c163bf2a674c8b76aa5a7ba86e79c84bcec20)
 2012-09-12 22:56:43 -04:00
Keegan McAllister f4b00d802a forge_zephyr: Take fullname, shortname from POST 
(imported from commit a983cfbf4fcb6395dcef64c81c984dd05169c1e9)
 2012-09-12 21:10:20 -04:00
Jessica McKellar a211314240 Add dummy name data for forged zephyr users. 
(imported from commit cec8beefe97bc0acbd22a170d41233d4fc642cc6)
 2012-09-11 16:39:37 -04:00
Jessica McKellar bfdf2bef57 [schema] Collect and display names and e-mail addresses. 
(imported from commit aa6bceb05fcd5b456c03288cbfed65b14050fe88)
 2012-09-11 16:34:53 -04:00
Tim Abbott 37b1c1db11 Stop using foo.pk when we mean foo.id. 
(imported from commit b86359254415f65b32eeefdfbcb38d7bb862c1ac)
 2012-09-10 13:43:17 -04:00
Tim Abbott ca132789bb [schema] Store Recipient types more efficiently. 
(imported from commit e0625ce9d2382682a5c8d53a5ac31a0399075df8)
 2012-09-10 10:03:50 -04:00
Keegan McAllister 0d857d6855 Remove unused exception variables 
(imported from commit 74adf1cecbb2704cdfe8a6d8a73812d9997a8384)
 2012-09-07 13:57:32 -04:00
Keegan McAllister 5a38fd2c48 Import something needed by @require_post decorator 
(imported from commit a2537ad75ae6e8eeb3e543c425b14214c03775b0)
 2012-09-07 13:57:32 -04:00
Keegan McAllister 80c6d09197 Remove unused imports 
(imported from commit 9f5c226708e44935e8d32c18ea7dd1ad2615d8d5)
 2012-09-07 13:57:32 -04:00
Tim Abbott 4fd1230265 require login for get_updates_longpoll. 
(imported from commit 64dec53e102e47c42109e064efc46e9812943640)
 2012-09-07 13:32:20 -04:00
Tim Abbott c7be5cfadc Clean up user_profile getting. 
(imported from commit 86be3c8061ac46510d240703c8e88eedb0883a8c)
 2012-09-07 13:31:01 -04:00
Tim Abbott d8ade6de5b Add create_zephyr_class helper. 
(imported from commit 993fbb799b706e402ae212330e4abbe28bf84ee9)
 2012-09-07 13:28:56 -04:00
Tim Abbott 4848ae3c48 Clean up recipient creation for new ZephyrClass objects. 
(imported from commit 2aa67fbcc6c01ca1c07f41e0edb6c9efcd336006)
 2012-09-07 13:28:56 -04:00
Tim Abbott f170517e0f Add more arguments checking in views. 
(imported from commit 389d0b724b88b0097cef2addd27704657b35cabe)
 2012-09-07 13:28:56 -04:00
Tim Abbott ce2ad38cc2 Remove dead code in home view. 
(imported from commit 5bc0d2d38de23828f19915c047e605e97b733b26)
 2012-09-07 13:28:56 -04:00
Tim Abbott 14ab1a7044 get_updates_longpoll: Add error handling for malformed input. 
(imported from commit c44758acd2b3b07bed6536f70fa50e23fb4231b6)
 2012-09-07 13:28:56 -04:00
Tim Abbott 2486a68621 Use @require_post in a few more places. 
(imported from commit d1a643780d6448f66505475c8f7c1f4646981022)
 2012-09-07 13:28:56 -04:00
Tim Abbott da491de948 Strip whitespace from requested class subscription names. 
(imported from commit bb10ba64a2f76c089ff36574b30b76f725da62aa)
 2012-09-07 12:50:18 -04:00
Tim Abbott 111cda9f21 Clean up inefficient queries in the home view. 
(imported from commit fd958aef79a92eb4418e832b0d2b62a978f5776f)
 2012-09-07 11:28:36 -04:00
Tim Abbott 7a0b5ce198 More efficiently populated the personals autocomplete list. 
(imported from commit 8e37b8c707ca1c13238a4c1d3b136cb74aec0af7)
 2012-09-07 11:28:36 -04:00
Tim Abbott 6c330b2654 [schema] Store zephyr receipts in new UserMessage table. 
(imported from commit d909adf7528aba9a489280ebc3572791539cdd44)
 2012-09-07 11:27:41 -04:00
Jessica McKellar 13e5b45815 Return a JSON error on an invalid zephyr type. 
(imported from commit 2207464c368666715caf550f32136de45ea37142)
 2012-09-06 16:06:26 -04:00
Tim Abbott b235b8bc31 Fix user of UserProfile instead of User. 
(imported from commit 08875b4fc7dec48a8fce6d6eab716642493a0708)
 2012-09-06 16:04:42 -04:00
Tim Abbott 10873529fd Fix forge_zephyr bug. 
(imported from commit 30f69247d9094d17a1af014ce3d6b60d85ae5c41)
 2012-09-06 16:01:50 -04:00
Tim Abbott 1775ffe80a Improve forge_zephyr code. 
(imported from commit c95c4392b09c932d8de11d30b730ab5d7bcb9e83)
 2012-09-06 16:00:39 -04:00
Tim Abbott d9f348a348 Add zephyr_backend RPC call. 
(imported from commit e815580e201772e81e94b820174e2410e3069960)
 2012-09-06 15:52:48 -04:00
Jessica McKellar aa8ea169c7 Return our standard JSON success data on /zephyr POST. 
(imported from commit 045e209d1a001d27b755a45984f9e159470b80bc)
 2012-09-06 15:46:48 -04:00
Tim Abbott ef7786d777 Create a Recipient for classes created by sending a zephyr. 
(imported from commit 8556392f84b0a7fc21b6405c87ceac1c49b37a52)
 2012-09-06 15:43:35 -04:00
Tim Abbott d466738116 Fix creating new classes by sending messages to them. 
(imported from commit a85034081d23f5366e0cdc4b906fd42b4b646aba)
 2012-09-06 15:35:12 -04:00
Jessica McKellar 4f04172288 Add error handling on bad POSTs to /update. 
(imported from commit 7893e9d339559a6f6e945d0f8d3d9efbdce01f55)
 2012-09-06 15:02:27 -04:00
Luke Faraone f6b481546f Offer to subscribe / create classes if user zwrites to a non-subbed class 
Here we check if a class exists. If not, we prompt the user to create, sub,
and send his message to the class. If the class exists but we're not subbed
we prompt the user to sub.

This commit also added a decorator to views.py and refactored out some
redundant code.

(imported from commit 7234ef6c080f2a6de6ff0922635dddd90032f7fe)
 2012-09-06 14:33:55 -04:00
Tim Abbott e66e2f3be6 Fix new instance of recipient_id. 
(imported from commit 4b3442a3a45138e18c2b33867d6c5af4b4427691)
 2012-09-06 11:06:25 -04:00
Tim Abbott ef25dffb92 [schema] Add the realm to the ZepyhrClass objects. 
(imported from commit 8189ef27f2feef0c92f9c06a9243c085e36a66f5)
 2012-09-06 11:02:34 -04:00
Tim Abbott b761bf030b [schema] Fix names of fields in Subscription. 
(imported from commit 5f5c643286d348d16caac03419ba3011a8b81eff)
 2012-09-06 11:02:34 -04:00
Tim Abbott 38b30e5997 [schema] Add realms to the schema. 
Note that realms aren't actually used for anything, aren't prompted
for, etc, so this is mostly just a schema change and the refactoring
needed to allow setting the realm in the future.

(imported from commit b8b483dcc9601b288702284879e9c99707a50a5c)
 2012-09-06 11:02:34 -04:00
Jessica McKellar aea9682288 Handle zephyring to a huddle with an invalid username. 
(imported from commit 953b242aff98782faab8eb2c7a9528ad4bfbcd54)
 2012-09-05 18:01:07 -04:00
Jessica McKellar f539b5ec59 Handle trying to send a zephyr to a non-existent class. 
(imported from commit 38c6df92ae8dc9dee358aa9af0ef592943b82429)
 2012-09-05 18:01:07 -04:00
Jessica McKellar 22c2a868c1 Factor out json success and error handling. 
(imported from commit 1891e077a18615d47710faf56b04c4bd160454fa)
 2012-09-05 18:01:07 -04:00
Jessica McKellar cede8e59fb Return a 400 and error message instead of 500ing on a personal to an invalid user. 
(imported from commit b8cdf342f2919aa0dbd2e30764c7662b6756aa57)
 2012-09-05 18:01:06 -04:00
Luke Faraone 3366346144 Return subs in JSON based on a query of your subs list rather than sorting through recieved zephyrs. 
(imported from commit 451435aee2c2cf6ee542468b1c91c4a15edf2032)
 2012-09-05 16:15:38 -04:00