public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,126 Commits
190 Branches
71 Tags
55 MiB
Commit Graph

3126 Commits (bf4c86ed94b33f74902eab04abc1d2538c7e2001)

Author SHA1 Message Date
Peter 'Pita' Martischka 0953a5ac33 Brought scheduler back completly, fixes #1502 2013-02-11 20:51:40 +00:00
John McLear e87843c5ae Merge pull request #1495 from disy-mk/patch-1 
Explicitly log creation of pad
 2013-02-10 18:19:56 -08:00
Manuel Knitza b1586684c8 Explicitly log creation of pad 2013-02-11 03:03:18 +01:00
John McLear 60ef5f210a remove duplicate code to the best of my ability right now 2013-02-10 23:41:14 +00:00
John McLear 1a77e57503 Merge pull request #1487 from ether/dep-cleanup 
Dependancy cleanup
 2013-02-10 15:19:20 -08:00
John McLear 29e2df7ad4 Merge pull request #1494 from ether/feature/browserTests 
Windows and Mobile tests should be case insensitive
 2013-02-10 15:17:19 -08:00
Peter 'Pita' Martischka 17a02bb024 Merge branch 'develop' of github.com:ether/etherpad-lite into dep-cleanup 2013-02-10 22:41:49 +00:00
Peter 'Pita' Martischka b0f555e669 Revert "no longer dep on npm as it's native" 
This reverts commit 85f18d1f92.
 2013-02-10 22:26:39 +00:00
John McLear 28f6d50011 remove console warn 2013-02-10 22:14:05 +00:00
Peter 'Pita' Martischka 25fd3c5901 Windows and Mobile tests should be case insensitive 2013-02-10 22:10:25 +00:00
John McLear 9c4a2ef819 Merge pull request #1493 from ether/feature/fixtests 
Fixes for the testrunner
 2013-02-10 14:06:02 -08:00
Peter 'Pita' Martischka 70c0591d35 Make iframe selectors work with jquery 1.9 2013-02-10 22:02:24 +00:00
Peter 'Pita' Martischka 8d8487dfa6 Made jquery browser usable in testframework 2013-02-10 21:49:00 +00:00
John McLear bd33061c8a Merge pull request #1492 from ether/feature/cleanup 
Several code cleanups
 2013-02-10 13:38:26 -08:00
Peter 'Pita' Martischka 1fbd408e82 replaced opera regex check with jquery browser check 2013-02-10 21:21:22 +00:00
Peter 'Pita' Martischka 500c451ba1 removed hack, because its uncessary now that scheduler is back 2013-02-10 21:19:48 +00:00
John McLear 3325aa8468 bit of info about deps 2013-02-10 21:15:00 +00:00
John McLear d7992a1366 begin putting files together for a release 2013-02-10 21:13:51 +00:00
Peter 'Pita' Martischka 5e041aaedb Moved old jquery recognition to seperate file 2013-02-10 20:34:27 +00:00
Peter 'Pita' Martischka 60de52477c jquery shouldn't be checked in 2013-02-10 20:14:13 +00:00
John McLear bcf9c23b4e dont use HTML filter hooks on txt export 2013-02-10 19:38:16 +00:00
John McLear 626ee97669 kinda brutal way of stopping plugins being able to pass *s instead of attributes 2013-02-10 19:36:46 +00:00
John McLear a67a0950dd stop urls being encoded, not sure about other security implications here... 2013-02-10 19:21:27 +00:00
Siebrand Mazeland 5248dac016 Localisation updates from http://translatewiki.net. 2013-02-10 19:15:11 +00:00
John McLear 69a6d5468e a bit fairer 2013-02-10 17:53:17 +00:00
John McLear a378f48c00 remove console warns 2013-02-10 17:39:02 +00:00
John McLear d16b15f3eb begin support for better txt output 2013-02-10 17:34:34 +00:00
John McLear e552e74feb Merge pull request #1486 from ether/please-wait-msg 
please wait msg
 2013-02-10 07:19:46 -08:00
John McLear 6aeed1268e change message 2013-02-10 15:19:28 +00:00
Marcel Klehr 6d2b1488d6 Reformat access log messages to improve readability 2013-02-10 16:14:48 +01:00
John McLear 3760b97170 Merge pull request #1489 from marcelklehr/feature/log-client-ips 
Log the client ip on pad access
 2013-02-10 07:09:56 -08:00
Marcel Klehr ee89696c4d Log the client ip on pad access with logger 'access' 
also, don't log every message with log level info!
 2013-02-10 16:03:49 +01:00
John McLear 2634e8120a Merge pull request #1485 from ether/readme-placeholder 
remove one less warning during install by having a readme placeholder
 2013-02-10 05:59:33 -08:00
Marcel Klehr 6191b01633 Merge pull request #1477 from ether/fix-opera-double-enter 
Fixes #940: opera double enter
 2013-02-10 05:10:38 -08:00
John McLear 85f18d1f92 no longer dep on npm as it's native 2013-02-10 03:39:20 +00:00
John McLear f617cefe54 no need for jshint and update wd 2013-02-10 03:30:08 +00:00
John McLear 3a73aa2f48 please wait msg 2013-02-10 03:17:04 +00:00
John McLear 8f2025067b remove one less warning during install by having a readme placeholder 2013-02-10 03:04:08 +00:00
John McLear 98d45af0f9 Merge pull request #1484 from disy-mk/develop 
jquery update 1.7.1 -> 1.9.1
 2013-02-09 18:18:40 -08:00
Manuel Knitza 98a9b1e222 update jquery 1.7.1 -> 1.9.1 2013-02-10 02:55:50 +01:00
Manuel Knitza 7b3d567d0c .browser() support 
Code appended to support use of .browser() (which is deprecated as of jquery 1.3 and was removed with v.1.9.0)
 2013-02-10 02:53:07 +01:00
John McLear cd77f3e637 Merge pull request #1483 from 0ip/ua 
Add UA functions
 2013-02-09 17:47:34 -08:00
Manuel Knitza 7389e90cd0 update jquery 1.7.1 -> 1.9.1 2013-02-10 02:37:17 +01:00
0ip c3a29d1480 Add missing export entry for the browser object 2013-02-09 22:35:10 +01:00
0ip 7ddfdc3935 Add UA functions 2013-02-09 22:26:47 +01:00
John McLear 56de6937e2 Merge pull request #1480 from 0ip/admin-ui 
A few improvements to the admin dashboard
 2013-02-09 12:43:49 -08:00
0ip 8a6b3c90e2 Fix loader styling 2013-02-09 21:29:11 +01:00
0ip 8fb8f0d3b6 Change settings layout 2013-02-09 21:22:23 +01:00
0ip 40734e6776 Fix table CSS 2013-02-09 20:58:57 +01:00
0ip ad54369bf1 Add doctype 2013-02-09 20:57:41 +01:00