Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
52,701 Commits 28 Branches 142 Tags 769 MiB
Commit Graph

4745 Commits

Author SHA1 Message Date
Zev Benjamin ba62cab801 Add Bitbucket integration instructions 
(imported from commit 6976e75577ebacfbd2330a45f430d544c1a2cfcf)
 2013-08-16 14:38:54 -04:00
Allen Rabinovich 17e07d551f Additional fixes for relayout regressions. 
Specifically:
   * Fix the settings menu positioning and appearance
   * Restyle menu and add arrow on top
   * Remove labels from new message buttons in narrow windows and adjust the close button on the composition pane

(imported from commit 586753b6526289b32ec0a90b62d8b2ac1c8182cd)
 2013-08-15 15:28:51 -07:00
Waseem Daher 78b1f7140e Reorganize 'Share the love' layout slightly. 
(imported from commit 6afb3d491753e28f58b0b801ede2398f49deb8f9)
 2013-08-15 18:04:43 -04:00
Waseem Daher 90617db8a1 Allow "Share the love" to be expanded and collapsed. 
(imported from commit 9e620c5882d58f41d25124a690aa4154f93173db)
 2013-08-15 18:04:43 -04:00
Allen Rabinovich 0b78fab636 Switch to fixed sidebar layout and remove bootstrap layout hooks. 
(imported from commit 060340a2febb7b8df6477a3419e7588a8503e377)
 2013-08-15 11:05:11 -04:00
Scott Feeney 49a511ff20 Use "Zulip", not "Zulip logo", as logo alt text 
(imported from commit e3d3024a136c61643d1e5557712cc82880e4dcbf)
 2013-08-15 11:02:05 -04:00
Waseem Daher bae322f020 apps: Link to apt.humbughq.com instead. 
apt.zulip.com is not yet operational.

(imported from commit 4d3c15d0764b4c979fb8c5b7d829e88345872468)
 2013-08-14 17:14:52 -04:00
Jeff Arnold ec2f013723 Make the left sidebar and right sidebar more consistent. 
Addresses Trac #1500.

(imported from commit ad59d6f78042ce89a99ad60c7c34f67144e9c776)
 2013-08-13 16:34:16 -04:00
Luke Faraone ecc42bc9f8 Add administrative panel to allow for user deactivations etc. 
We now show a list of users and allow you to deactivate a user using the
same process as `python manage.py deactivate_user`.

We add a new menu item accessible from the gear icon which will eventually
have much more than just this, but we have a good start here.

Here we also add a property to UserProfile which determines whether you're
eligible to access the administration panel, and then have code which shows
the menu option if so.

This introduces a new JS file, admin.js.

(imported from commit 52296fdedb46b4f32d541df43022ffccfb277297)
 2013-08-13 14:20:18 -04:00
Waseem Daher dfb60ee966 File uploads using Dropbox. 
(imported from commit c552133fc7025eca526fbfef24fd544260d7111b)
 2013-08-12 17:22:23 -04:00
Zev Benjamin 46eb90a238 referral: Clean up display of validation errors 
* We now clear the validation errors when the input box is de-focused
* We make the left sidebar height accommodate the validation error messages

(imported from commit 4b39bfd3e8e8dd707722492a3f98967ee4ccf0ab)
 2013-08-12 12:50:33 -04:00
Zev Benjamin 51beeba854 referral: Prevent empty form submission 
(imported from commit cc012e84c21bc424adaaa79611f09415480a2ba5)
 2013-08-12 12:50:32 -04:00
Zev Benjamin 9a0851f82f referral: Move explanatory text above input box 
(imported from commit e4802b4b05a5aa8c4fa4631c5d36876632ba393b)
 2013-08-12 12:50:32 -04:00
Zev Benjamin 126fcd42d7 referral: Show feedback immediately and don't show errors 
(imported from commit 3bf6071c4fdeeaa50ea05c60b4bf0244c78ebeb0)
 2013-08-12 12:50:32 -04:00
Waseem Daher da01c3b3da customer3: Explanatory text on registration form(s). 
(imported from commit 39f2a06149514df271e3302ca32c41934b0fc630)
 2013-08-12 11:13:15 -04:00
Tim Abbott e9d53578a4 Fix Python bindings function in docs for /register API endpoint. 
(imported from commit ba6b31f78a897c6b647e38d91749639509e0a491)
 2013-08-09 20:47:12 -04:00
Tim Abbott dd50f29b3d get_events: Don't return a queue ID unless we allocated one. 
(imported from commit 85ad1aa2a0d52247c5efcecfab5212e40b876b88)
 2013-08-09 15:35:33 -04:00
Tim Abbott 9d6627d269 Rewrite documentation for /api/endpoints. 
The main changes are:
(1) Changing the input format for the example response so that it is
human-readable and editable
(2) Updating it to use the events API

(imported from commit 308fade9595d6877836d343d2307e3fceff3e7d4)
 2013-08-09 15:34:57 -04:00
Tim Abbott e3bd106397 Clean up the API main documentation a bit. 
(imported from commit 7f9dc5f98ac50be6e7e6d4ce69716cb9477099f0)
 2013-08-09 15:34:57 -04:00
Tim Abbott 06d6d14fd7 [manual] Bump API version to 0.2.0. 
When we deploy this, we'll need to of course actually build and deploy
the new API tarball.

(imported from commit 03c853e8a9424a63f1c74bb83637d5a1e50a159a)
 2013-08-09 15:34:57 -04:00
Tim Abbott b0d7830311 api: Fix whitespace in Python example. 
(imported from commit 6bad9210b4c85ea097679ff70b4b0ed2176a6945)
 2013-08-09 15:34:57 -04:00
Steve Howell 626a737973 [important fix] Restore buddy list. 
(There was an extra </div> tag.)

(imported from commit 500114eea1c93264ea590e6c7a9c0b1bacfb9710)
 2013-08-08 13:19:01 -04:00
Steve Howell 6f49f13b03 Use 2-space indents consistently in settings.html. 
(imported from commit eb8bb4b5078db29b65ba5c40989651151275dea3)
 2013-08-08 13:03:10 -04:00
Steve Howell 722c1b1a43 Allow user to change their API key. 
(imported from commit b7c50779d0209c6e6600b59c8760a81273fe2454)
 2013-08-08 13:03:09 -04:00
Waseem Daher aa29719bbd Update zephyr_mirror instructions slightly. 
(imported from commit 0660dfdd1ba16179c88d750f9d319603234d2480)
 2013-08-08 12:09:22 -04:00
Tim Abbott 87f8c9333c Rename Humbug => Zulip in app screenshot filenames. 
(imported from commit a1a753143e77e0efd1de727378d505815a6d44d3)
 2013-08-08 10:22:32 -04:00
Tim Abbott b4d74b4fbc Rename /usr/local/share/humbug/ to /usr/local/share/zulip/. 
(imported from commit 6b5d13b36f96c7174e70ce1391f1d66724c45a62)
 2013-08-08 10:22:32 -04:00
Tim Abbott f137fa833b Rename Humbug-based variables/paths in jira plugin. 
(imported from commit a4596acc5c2d8da5cecad772e9cda5a371189299)
 2013-08-08 10:22:31 -04:00
Tim Abbott aba11be192 Rename Humbug-based variables/paths in svn plugin. 
(imported from commit 43a9282ad86546fb59e91c36e97a595e51789d07)
 2013-08-08 10:22:31 -04:00
Tim Abbott 94f8933b8d Rename Humbug-based variables/paths in git plugin. 
(imported from commit e153c7a1a68e82dd3fa45251644be74c62770a9d)
 2013-08-08 10:22:31 -04:00
Tim Abbott 53a47e8534 Rename Humbug-based variables/paths in Nagios plugin. 
(imported from commit fe8e33241215ea880f7351c3c86b0fb546faf8d3)
 2013-08-08 10:22:31 -04:00
Tim Abbott 3005792734 Rename Humbug-based variables in Trac plugin. 
(imported from commit 5d406cb6c5fe7b1fbd4da706f7ac6bb6e381cadb)
 2013-08-08 10:22:31 -04:00
Tim Abbott 6550134b3e Rename humbug_*_config.py to zulip_*_config.py. 
(imported from commit a1d4dd22c59f812f0eb4875dc70c89ce96a4b90c)
 2013-08-08 10:22:31 -04:00
Tim Abbott 03293b7be9 Rename humbug-send to zulip-send. 
(imported from commit 61400841f8fffe4c706d867aaa012059bcba271d)
 2013-08-08 10:22:31 -04:00
Tim Abbott 747a9c536f Rename the 'humbug' API module to 'zulip'. 
(imported from commit b3a3d7c05459cbb0110cd0fbe2197d779f3a6264)
 2013-08-08 10:22:31 -04:00
Tim Abbott 2ea1bb05a5 Rename ~/.humbugrc to ~/.zuliprc. 
(imported from commit a0d53dd20097a56971874dc1d84c6f95267e84f2)
 2013-08-08 10:22:31 -04:00
Waseem Daher 4060ff3950 Revise landing page to focus more on our unique strengths. 
(imported from commit 50d641d3e24ce57c873d0ea5deb077b825c14782)
 2013-08-07 22:51:03 -04:00
Scott Feeney 3b8ec3d185 Add a forgot-password link to the API key prompt 
(imported from commit a5da4f6a228398b8296e147f327ee8daaced1f1a)
 2013-08-07 17:49:27 -04:00
Steve Howell 44057cb31b Add divider between Streams and Settings in the gear menu. 
(imported from commit 2ed27a11e8358adead792de5e8c40b10691f142a)
 2013-08-07 10:59:44 -04:00
Tim Abbott 1f1af26048 Change Humbug => Zulip in text/comments. 
(imported from commit 2f9d73431ae40e1b9e9e11bc2f4f62f566ae758a)
 2013-08-07 10:00:07 -04:00
Zev Benjamin 5e1d893509 Revert "Temporarily remove "Share the love" from DOM & JS" 
This reverts commit fc7af47400f6c96161913dcc98be128c116d90c5.

(imported from commit 8f58425ec3bd95220e109eeb7be21fa449508427)
 2013-08-06 17:18:40 -04:00
Zev Benjamin a67809c327 Move remaining error/warning messages from the top navbar to the right sidebar 
(imported from commit e7147cb85caec891c3401da8144b3b07a6037cd6)
 2013-08-06 15:21:56 -04:00
Jeff Arnold 8357b193b0 Update name to Zulip, Inc. from Humbug, Inc. 
(imported from commit 1705da1f3e10c2dc391d43d5535d795403e2b85c)
 2013-08-06 11:06:57 -04:00
Scott Feeney 29b3b42ac7 Temporarily remove "Share the love" from DOM & JS 
(imported from commit fc7af47400f6c96161913dcc98be128c116d90c5)
 2013-08-06 10:47:42 -04:00
Tim Abbott e111a2f9a5 [manual] Rename Django app from zephyr to zerver. 
This needs to be deployed to both staging and prod at the same
off-peak time (and the schema migration run).

At the time it is deployed, we need to make a few changes directly in
the database:

(1) UPDATE django_content_type set app_label='zerver' where app_label='zephyr';
(2) UPDATE south_migrationhistory set app_name='zerver' where app_name='zephyr';

(imported from commit eb3fd719571740189514ef0b884738cb30df1320)
 2013-08-06 07:39:36 -04:00