Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Release 1.2.7 #1433

Merged
merged 45 commits into from

5 participants

@JohnMcLear
Owner

No description provided.

JohnMcLear and others added some commits
@JohnMcLear JohnMcLear bring in some padDiff stuff that doesnt suck 5d41657
@JohnMcLear JohnMcLear make it crash 205d983
@JohnMcLear JohnMcLear mheh d21585b
@JohnMcLear JohnMcLear semi working 3fb2f02
@JohnMcLear JohnMcLear and semi working f1b9c21
@JohnMcLear JohnMcLear fix make file issue 7740394
@luto luto Rewrote getParams() to be more dynamic and shorter 7432b7a
@Pita Pita fixed indent f4690dd
@Pita Pita Added missing functions to create pad diffs dcfb1b2
@JohnMcLear JohnMcLear make makefile work for darwin(mac) 6f743c6
@Pita Pita Added colors to pad diff 07a267b
@JohnMcLear JohnMcLear take two at fixin Mac issue d478ae2
@JohnMcLear JohnMcLear Merge pull request #1412 from ether/fix-doc-build
fix make file issue
189f434
@Pita Pita Fixed HTML export 878fd76
@JohnMcLear JohnMcLear docs ed5644d
@JohnMcLear JohnMcLear resolve merge conflict 3fac18f
@siebrand siebrand Localisation updates from http://translatewiki.net. 75b861e
@luto luto Jump to revision given in URL, add current revision to URL f974136
@JohnMcLear JohnMcLear change to createDiffHTML 4378561
@JohnMcLear JohnMcLear change to createDiffHTML 51eff0d
@luto luto Renamed paramSettings to getParameters, to cause less confusion a239158
@marcelklehr marcelklehr Merge pull request #1413 from mluto/clean-getParams
Rewrote getParams() to be more dynamic and shorter
dcff3bd
@luto luto Added tests for revision-jumping 3002807
@luto luto Added a test to check the export-url 0b90e57
@luto luto Only set url if the revsion will actually be loaded 01fe5c1
@JohnMcLear JohnMcLear Merge pull request #1418 from mluto/timeslider-jump-revisions
Jump to revisions in timeslider
e1cd347
@JohnMcLear JohnMcLear Merge pull request #1417 from ether/diff-view
Adds an API endpoint for Diff view
c6f9979
@JohnMcLear JohnMcLear have a nice changelog makes it easier for when we release 10c2ac2
@JohnMcLear JohnMcLear Merge branch 'develop' of github.com:ether/etherpad-lite into develop 4c5ef1f
@JohnMcLear JohnMcLear introduce gritter files and ensure its available 2ae3dae
@JohnMcLear JohnMcLear gritter now implemented 1c78107
@JohnMcLear JohnMcLear spacing fa79525
@JohnMcLear JohnMcLear make tinycon update on all chat messages not just ones that mention y…
…our name
a7361f5
@JohnMcLear JohnMcLear remove message about requiring comments daaa650
@JohnMcLear JohnMcLear push authorID to author object and return via api... edd8b12
@JohnMcLear JohnMcLear docs for api change a19ad98
@JohnMcLear JohnMcLear Merge pull request #1426 from ether/notifications
Modularize Notifications
9ed2a2b
@JohnMcLear JohnMcLear Merge pull request #1428 from ether/padUsers-authorID
Include author ID in padUsers response
e7cb7c4
@luto luto Don't show notifications when loading the chat-messages. b5eeeb7
@luto luto Check for missing userInfo f2742c5
@luto luto Check for missing payload on CLIENT_MESSAGE 7e48e02
@JohnMcLear JohnMcLear Merge pull request #1430 from mluto/notification-on-startup
Don't show notifications when loading the chat-messages.
5b285e2
@JohnMcLear JohnMcLear Merge pull request #1431 from mluto/fix-userinfo-crash
Fix USERINFO_UPDATE crash
1814c75
@JohnMcLear JohnMcLear Merge pull request #1432 from mluto/rename-save-revision
Renamed "Saved Revisions" to "Save Revision"
037ca9b
@JohnMcLear JohnMcLear changelog and package file 594d53e
@marcelklehr marcelklehr reopened this
@marcelklehr marcelklehr merged commit 7a0ad32 into master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jan 22, 2013
  1. @JohnMcLear
  2. @JohnMcLear

    make it crash

    JohnMcLear authored
  3. @JohnMcLear

    mheh

    JohnMcLear authored
  4. @JohnMcLear

    semi working

    JohnMcLear authored
  5. @JohnMcLear

    and semi working

    JohnMcLear authored
Commits on Jan 27, 2013
  1. @JohnMcLear

    fix make file issue

    JohnMcLear authored
  2. @luto
  3. @Pita

    fixed indent

    Pita authored
  4. @Pita
  5. @JohnMcLear
  6. @Pita

    Added colors to pad diff

    Pita authored
  7. @JohnMcLear
  8. @JohnMcLear

    Merge pull request #1412 from ether/fix-doc-build

    JohnMcLear authored
    fix make file issue
  9. @Pita

    Fixed HTML export

    Pita authored
  10. @JohnMcLear

    docs

    JohnMcLear authored
  11. @JohnMcLear

    resolve merge conflict

    JohnMcLear authored
  12. @siebrand
Commits on Jan 28, 2013
  1. @luto
  2. @JohnMcLear

    change to createDiffHTML

    JohnMcLear authored
  3. @JohnMcLear

    change to createDiffHTML

    JohnMcLear authored
  4. @luto
  5. @marcelklehr

    Merge pull request #1413 from mluto/clean-getParams

    marcelklehr authored
    Rewrote getParams() to be more dynamic and shorter
  6. @luto
  7. @luto
  8. @luto
  9. @JohnMcLear

    Merge pull request #1418 from mluto/timeslider-jump-revisions

    JohnMcLear authored
    Jump to revisions in timeslider
  10. @JohnMcLear

    Merge pull request #1417 from ether/diff-view

    JohnMcLear authored
    Adds an API endpoint for Diff view
  11. @JohnMcLear
  12. @JohnMcLear
Commits on Jan 29, 2013
  1. @JohnMcLear
  2. @JohnMcLear

    gritter now implemented

    JohnMcLear authored
  3. @JohnMcLear

    spacing

    JohnMcLear authored
  4. @JohnMcLear
  5. @JohnMcLear
  6. @JohnMcLear
  7. @JohnMcLear

    docs for api change

    JohnMcLear authored
  8. @JohnMcLear

    Merge pull request #1426 from ether/notifications

    JohnMcLear authored
    Modularize Notifications
  9. @JohnMcLear

    Merge pull request #1428 from ether/padUsers-authorID

    JohnMcLear authored
    Include author ID in padUsers response
Commits on Jan 30, 2013
  1. @luto
  2. @luto

    Check for missing userInfo

    luto authored
  3. @luto
  4. @JohnMcLear

    Merge pull request #1430 from mluto/notification-on-startup

    JohnMcLear authored
    Don't show notifications when loading the chat-messages.
  5. @JohnMcLear

    Merge pull request #1431 from mluto/fix-userinfo-crash

    JohnMcLear authored
    Fix USERINFO_UPDATE crash
  6. @JohnMcLear

    Merge pull request #1432 from mluto/rename-save-revision

    JohnMcLear authored
    Renamed "Saved Revisions" to "Save Revision"
  7. @JohnMcLear
Something went wrong with that request. Please try again.