Commit graph

3373 commits

Author SHA1 Message Date
webzwo0i
656a558af9 be more clear about the value in propVals 2013-12-08 11:35:28 +01:00
webzwo0i
a534b1ec22 some more docs for attribute export and cleanup empty lines 2013-12-08 11:34:11 +01:00
webzwo0i
70c51d731b add some documentation for styling attributes export 2013-12-08 11:33:20 +01:00
webzwo0i
86791707cd fix export so no tags are omitted 2013-12-08 11:31:23 +01:00
Siebrand Mazeland
03d5acfd0c Localisation updates from https://translatewiki.net. 2013-12-05 22:01:36 +00:00
Marcel Klehr
37442d301c Merge pull request #2021 from ldidry/fix-no-tab-indent
Replace tabs indentation with spaces indentation
2013-12-05 06:22:33 -08:00
Marcel Klehr
60017e9190 Merge pull request #2019 from ether/lighter-colors
allow for lighter colors
2013-12-05 05:42:14 -08:00
Luc Didry
3d8452b143 Replace tabs indentation with spaces indentation
Some files are obviously external libraries, I didn't touch them
2013-12-05 08:41:29 +01:00
John McLear
378e07964b allow for lighter colors 2013-12-04 23:01:08 +00:00
John McLear
03ff5563f4 Merge pull request #2017 from eloydegen/master
Update pad.html
2013-12-02 08:21:38 -08:00
Eloy
de3a657c6b Update pad.html
Select the URL when click at the text.
2013-12-02 16:43:52 +01:00
Siebrand Mazeland
f2e63df9cb Localisation updates from https://translatewiki.net. 2013-12-02 08:26:08 +00:00
John McLear
1fa2b32854 Merge pull request #1999 from s1341/fix_json_is_bad
strip off trailing commas
2013-11-26 05:16:42 -08:00
s1341
5181b3e467 add josnminify to package.json 2013-11-26 10:28:33 +02:00
s1341
9b7203d4d2 have the server parse the settings file using minify and strip commas 2013-11-26 10:20:59 +02:00
s1341
7550be0921 strip off trailing commas 2013-11-26 10:11:32 +02:00
John McLear
fb69e6b0a3 Merge pull request #2007 from ether/packaging
Debian deb file Packager
2013-11-25 09:40:04 -08:00
John McLear
b527ef2bc5 Merge pull request #2010 from ether/sticky-chat-resize
Sticky chat resize
2013-11-25 09:36:44 -08:00
John McLear
3be1ee5967 slightly cleaner 2013-11-25 17:36:24 +00:00
John McLear
252be19885 make sticky chat mroe responsive to changes in top bar 2013-11-25 17:33:33 +00:00
John McLear
81cf3a6ab3 Merge pull request #2008 from s1341/add_pad_copy
move copy/move pad into a new api version
2013-11-24 12:38:24 -08:00
s1341
45e0680484 move copy/move pad into a new api version 2013-11-24 22:34:56 +02:00
John McLear
8c1e066a02 mkdir 2013-11-24 13:13:29 +00:00
John McLear
97f5b581b0 cp readme on build 2013-11-24 13:08:26 +00:00
John McLear
1eef5278bd growwlll 2013-11-24 12:51:50 +00:00
John McLear
6ee57746c9 whoopsi 2013-11-24 12:44:09 +00:00
John McLear
d6f1aa3236 clean 2013-11-24 12:41:12 +00:00
John McLear
678c80d1dc whoa there, no need to include .git folder in build 2013-11-24 02:57:15 +00:00
John McLear
9d2f5e5cca Merge branch 'packaging' of github.com:ether/etherpad-lite into packaging 2013-11-24 02:53:14 +00:00
John McLear
09429be4c9 whoops 2013-11-24 02:52:55 +00:00
John McLear
bb40644856 ignore deb and create user 2013-11-24 02:52:03 +00:00
John McLear
61df1facd2 semi-working build script for deb packages 2013-11-24 02:42:50 +00:00
John McLear
8b821d42a2 Merge pull request #2004 from ether/fix/walking-caret
Fix walking caret bug
2013-11-22 08:28:07 -08:00
Marcel Klehr
5d803a0523 Fix walking caret bug
white-space css prop must be set to pre-wrap to keep trailing spaces
fixes #1766
2013-11-22 17:18:30 +01:00
Siebrand Mazeland
117a4ab1a8 Localisation updates from http://translatewiki.net. 2013-11-21 06:39:40 +00:00
Siebrand Mazeland
106661712d Localisation updates from http://translatewiki.net. 2013-11-19 06:43:22 +00:00
Marcel Klehr
53bcbfcc07 Don't link to windows build from README
better link to the website...
2013-11-18 14:25:47 +01:00
John McLear
47efc1f8d5 Merge pull request #1996 from s1341/add_pad_copy
add some documentation for move/copy
2013-11-18 05:02:16 -08:00
s1341
5409cdaa3f add some documentation for move/copy 2013-11-18 14:38:44 +02:00
John McLear
571ef15f62 Merge pull request #1995 from s1341/add_pad_copy
add pad copy/move API functions
2013-11-18 03:43:03 -08:00
s1341
52a99eb9e5 fix bugs, add force option to overwrite destination 2013-11-18 08:25:46 +02:00
s1341
93fcab0461 change parameter names 2013-11-17 21:01:02 +02:00
s1341
29d8bb7716 add pad copy/move API functions 2013-11-17 17:02:44 +00:00
John McLear
ccd4300edc Merge pull request #1994 from ether/node11
support node 0.11
2013-11-14 14:47:24 -08:00
John McLear
1f68f07083 support node 0.11 2013-11-14 22:46:58 +00:00
Siebrand Mazeland
1ee7c7000f Localisation updates from http://translatewiki.net. 2013-11-12 13:44:57 +00:00
John McLear
fa4ebd602c Update installDeps.sh 2013-11-12 09:58:22 +00:00
John McLear
5c1daa33be Merge pull request #1990 from ether/run-path-available-in-ps-aux
allow nix file process path to be visible in ps aux
2013-11-10 10:30:45 -08:00
John McLear
932c9ae406 allow nix file process path to be visible in ps aux 2013-11-10 16:32:33 +00:00
Marcel Klehr
8e5af48f79 en.json: Add keyboard shortcuts for indent and outdent to translations 2013-11-08 15:18:23 +00:00