wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11117 commits 157 branches 562 tags 714 MiB
Commit graph

1568 commits

Author SHA1 Message Date
Bart Visscher
46a552fd56 Merge pull request #2738 from Kondou-ger/fix_alert_issues 
Fixed things in alert-messages
 2013-04-06 08:24:43 -07:00
kondou
d556e7fbc0 Make files selectable again. 2013-04-06 17:22:55 +02:00
kondou
3e185911f1 Fix repeating directory names. 
Also fix some CSS for Firefox.
 2013-04-06 16:46:40 +02:00
kondou
fba6681f71 Make directories show at top. 2013-04-06 14:42:56 +02:00
kondou
6231e5be39 Make directories clickable. 
A bit bugged though ...
 2013-04-06 14:17:47 +02:00
kondou
1919acd68f Small fixes 
* escapeHTML(everything)
 * curly braces for if
 * camelcase function_to_call
 * add missing semicolae (?)
 2013-04-06 12:16:55 +02:00
kondou
0be80abe70 Refactor OCdialogs. 
Fix #2557 and make the whole code more usable.
 2013-04-06 10:07:12 +02:00
Jan-Christoph Borchardt
5525fade11 Merge pull request #2737 from Kondou-ger/proper_css_comments 
Proper CSS comment
 2013-04-05 07:58:00 -07:00
root
74b02db337 Fixed things in alert-messages 
Two parameters for OC.dialogs.alert, otherwise one will be "undefined".

Also fixed missing translation.
 2013-04-05 01:56:32 +02:00
root
69105fce00 Proper CSS comment 
CSS comments don't work like that.
 2013-04-05 01:17:52 +02:00
Jenkins for ownCloud
c745bfa821 [tx-robot] updated from transifex 2013-04-05 00:22:48 +02:00
Jenkins for ownCloud
cbece8b12f [tx-robot] updated from transifex 2013-04-04 00:06:51 +02:00
Jan-Christoph Borchardt
cd079e3421 group some selectors again 2013-04-03 20:06:26 +02:00
Jan-Christoph Borchardt
a35d869e15 add styles for disabled input fields 2013-04-03 18:45:03 +02:00
Jan-Christoph Borchardt
1c55b3a969 button selector cleanup 2013-04-03 17:55:31 +02:00
Jenkins for ownCloud
10e37e1553 [tx-robot] updated from transifex 2013-04-03 00:04:02 +02:00
Arthur Schiwon
e25c1f3130 port 22c8194cc8 2013-04-02 21:03:13 +02:00
Jan-Christoph Borchardt
48afa39292 Merge pull request #2275 from owncloud/app-styles 
CSS styles for applications to make a tree like layout easier
 2013-04-02 04:24:06 -07:00
Jan-Christoph Borchardt
c94580ba29 revert the untested not-working webroot stuff again ... grrr @Raydiation @stefannagtegaal 2013-04-02 11:52:57 +02:00
Jenkins for ownCloud
29d33ff7c2 [tx-robot] updated from transifex 2013-04-02 00:04:27 +02:00
Jenkins for ownCloud
9e29d2845a [tx-robot] updated from transifex 2013-04-01 00:04:02 +02:00
Bernhard Posselt
ab40634f33 Merge pull request #2622 from Kondou-ger/add_missing_backticks 
Add (two) missing backticks.
 2013-03-30 18:53:22 -07:00
Jenkins for ownCloud
cfd8b911b6 [tx-robot] updated from transifex 2013-03-31 00:03:46 +01:00
root
7f74f08808 Add missing backticks. 
Especially at user without "" PostgreSQL likes to fail.
 2013-03-30 23:52:26 +01:00
Jenkins for ownCloud
5e74ec26a8 [tx-robot] updated from transifex 2013-03-30 00:06:29 +01:00
Bernhard Posselt
86ac30c596 Merge pull request #2516 from kabum/master 
share autocomplete - improve group appearance - issue #173
 2013-03-29 07:28:09 -07:00
Jenkins for ownCloud
7098bcd4b7 [tx-robot] updated from transifex 2013-03-28 00:03:44 +01:00
Arthur Schiwon
c51396551d Whitespaces 2013-03-27 22:55:17 +01:00
Arthur Schiwon
3af61a0a7c Share Dialog: show Displayname instead of internal name 2013-03-27 22:55:05 +01:00
Arthur Schiwon
18554059a4 Remove Debug output 2013-03-27 19:12:53 +01:00
Arthur Schiwon
e2afd0cb42 Upgrade FileCache on ownCloud upgrade for all users with files 2013-03-27 19:12:28 +01:00
Jan-Christoph Borchardt
994a8797e4 remove extra type selector qualification for ID and class names 2013-03-27 17:39:09 +01:00
Jan-Christoph Borchardt
0b1dc7b0cc also use SVG for settings cog 2013-03-27 17:33:25 +01:00
Jan-Christoph Borchardt
5aa1ca5882 use SVG for folder image 2013-03-27 17:32:37 +01:00
Jan-Christoph Borchardt
bcf1b6f9f8 soften highlight for navigation entries 2013-03-27 17:11:40 +01:00
Jan-Christoph Borchardt
e167ccc5c6 modify app styles to adhere to coming CSS coding guidelines 2013-03-27 16:14:17 +01:00
Jenkins for ownCloud
0c666cb764 [tx-robot] updated from transifex 2013-03-27 00:11:05 +01:00
raghunayyar
8d7aa42b9a Removes the setTimeout() method. 2013-03-26 23:32:26 +05:30
raghunayyar
25a8690318 Fixes autofill for display / hide toggle button, a better function name. 2013-03-25 16:09:35 +05:30
raghunayyar
d9cd9875e0 Initial Commit : Password Toggle Button hides if no input present 2013-03-25 04:30:09 +05:30
Bernhard Posselt
c022dbe5c8 added %webroot% instead of relative path 2013-03-23 00:37:31 +01:00
Bernhard Posselt
bee9f7ebc6 also make bottom border grey on first level hover 2013-03-23 00:35:18 +01:00
Bernhard Posselt
adaf1d1959 small fixes 2013-03-23 00:35:18 +01:00
Bernhard Posselt
5d3e3a0a75 added app stylings to core 2013-03-23 00:35:18 +01:00
Jenkins for ownCloud
4f6e13e673 [tx-robot] updated from transifex 2013-03-23 00:06:16 +01:00
Morris Jobke
79d99b9c96 use simple markup to highlight groups in share autocomplete 2013-03-22 10:00:43 +01:00
Morris Jobke
8871629db5 replace hardcoded css style with css class - ref owncloud/core#173 2013-03-21 23:19:59 +01:00
Morris Jobke
a1a6ef9409 share autocomplete - improve group appearance 
highlight groups with markup (bold font) instead of "(group)" postfix

ref owncloud/core#173
 2013-03-21 22:45:36 +01:00
yannickoo
43b928aca6 Fixed typo 2013-03-21 18:46:59 +01:00
yannickoo
55fc03fda4 No Scrolling for more than approximately 10 Applications 2013-03-21 18:37:23 +01:00
Lukas Reschke
ad2d222466 Merge pull request #2447 from owncloud/fix_namespace_in_autoloader 
Remove leading and trailing backslashes in classname. Ref #2310
 2013-03-21 00:46:09 -07:00
Jenkins for ownCloud
3b1c7de459 [tx-robot] updated from transifex 2013-03-21 00:04:36 +01:00
Lukas Reschke
68d55648d5 Show a warning in the installer if the used PHP version is vulnerable to the NULL Byte attack 2013-03-20 08:44:33 +01:00
Lukas Reschke
dc41cf081c Check if the installed PHP version has a fix for the nullbyte vulnerability 2013-03-20 08:43:54 +01:00
Jenkins for ownCloud
63ca84e7bc [tx-robot] updated from transifex 2013-03-19 00:05:52 +01:00
Doug Neiner
b8c1a4da3e Upgraded infield labels plugin to the latest version. Updated invocation to opt-in to pollling at the same duration you were using before, 100ms 2013-03-17 22:21:34 -05:00
Jenkins for ownCloud
1427af4a22 [tx-robot] updated from transifex 2013-03-16 22:18:26 +01:00
Henning Oschwald
76bb5221c7 Restores keyboard accessibility for expandable settings area. 
Tabindex="0" makes the element focussable with the keyboard and
role="link" tells assistive technologies that this clickable span
element is supposed to be presented as a hyperlink.
 2013-03-16 16:32:55 +01:00
Frank Karlitschek
761540e78b Merge pull request #2320 from ceri/master 
Fix erroneous email when folders are shared
 2013-03-15 04:22:44 -07:00
Jenkins for ownCloud
0c123ebf9d [tx-robot] updated from transifex 2013-03-15 00:06:36 +01:00
Björn Schießle
8154b4be7d use display name as sender for private link mails, approved in #2294 2013-03-14 13:26:20 +01:00
Ceri Davies
17cb47fbf6 Correct emails when folders are shared. 
itemType is never "dir"; it's either "file" or "folder".
 2013-03-14 10:04:58 +00:00
Jenkins for ownCloud
9a0cb2ccaa [tx-robot] updated from transifex 2013-03-14 00:06:29 +01:00
Jenkins for ownCloud
569c7ab138 [tx-robot] updated from transifex 2013-03-12 00:14:05 +01:00
Bernhard Posselt
1e20067c00 Merge pull request #2183 from owncloud/fix-shared-statuses-again 
Fix #2080 and fix #2141
 2013-03-11 02:43:16 -07:00
Jenkins for ownCloud
6bdb84ab28 [tx-robot] updated from transifex 2013-03-10 00:06:53 +01:00
Jenkins for ownCloud
0629ff4dd9 [tx-robot] updated from transifex 2013-03-09 00:06:34 +01:00
Bernhard Posselt
9ad03b61a3 Update share.js 
Added HTML escaping
 2013-03-08 17:29:05 +01:00
Michael Gapczynski
6e5e8c6b46 Fix #2080 and fix #2141 2013-03-07 22:30:12 -05:00
Florian Hülsmann
0aa6c1b163 fixed header content padding 2013-03-07 19:28:17 +01:00
Frank Karlitschek
19073e0711 Merge pull request #2167 from owncloud/input-type-fix 
Input type fix
 2013-03-07 07:28:22 -08:00
Thomas Müller
a2aebbd742 Merge pull request #2130 from owncloud/fix_2128 
fix #2128
 2013-03-06 05:05:40 -08:00
Georg Ehrke
a83a5aa900 fix #2128 2013-03-06 13:02:44 +01:00
Lukas Reschke
630ee644db Don't sanitize error message hint 2013-03-06 12:56:27 +01:00
Jan-Christoph Borchardt
114c6457a3 add email input type to styled inputs, fix #2097 2013-03-06 12:38:43 +01:00
Michael Gapczynski
5300d6ad55 Clear the CSS and JS cache earlier to make sure update goes smoothly 2013-03-05 21:13:07 -05:00
Jenkins for ownCloud
c1a32b5073 [tx-robot] updated from transifex 2013-03-06 00:08:33 +01:00
Lukas Reschke
76e6369ec1 Merge pull request #2077 from owncloud/oc_filepicker_inline_js 
Remove inline js from OC.Dialogs.FilePicker.
 2013-03-04 13:49:52 -08:00
Jan-Christoph Borchardt
07dee24cb2 explicitly add empty placeholder to inputs which use infield labels, fix #2049 2013-03-04 22:11:57 +01:00
Thomas Tanghus
e9f46a7452 Remove inline js from OC.Dialogs.FilePicker. 2013-03-04 16:36:49 +01:00
Bernhard Posselt
841daf4845 Merge pull request #2062 from owncloud/shareType 
Sanitize shareWith
 2013-03-03 16:27:51 -08:00
Lukas Reschke
577945bd33 Sanitize shareWith 2013-03-04 00:54:21 +01:00
Jenkins for ownCloud
b738aaba2a [tx-robot] updated from transifex 2013-03-04 00:07:35 +01:00
Michael Gapczynski
0488968443 Merge pull request #2034 from owncloud/fix_bug47 
Fix #47 - Duplicate files create a (2) when multiples are uploaded
 2013-03-03 11:49:04 -08:00
Jörn Friedrich Dreyer
9cb5bf0a28 add ie css switch to layout templates 2013-03-03 13:57:20 +01:00
Jenkins for ownCloud
844e18a8b1 [tx-robot] updated from transifex 2013-03-03 00:06:56 +01:00
Georg Ehrke
620ddd3baa new Array() -> [] 2013-03-02 19:24:37 +01:00
Georg Ehrke
22424e8abc update OC.Notification.show 2013-03-02 17:36:04 +01:00
Brice Maron
050de008b1 Avoid to display empty DisplayNames for menu and title 2013-03-02 16:09:36 +01:00
Thomas Müller
2af3bc3e77 Merge pull request #2022 from owncloud/fix-notice 
Fix notice
 2013-03-01 23:39:27 -08:00
Lukas Reschke
630483c75d Fix notice 2013-03-02 00:53:53 +01:00
Jenkins for ownCloud
c9d9c381ec [tx-robot] updated from transifex 2013-03-02 00:05:42 +01:00
Lukas Reschke
5e7970f761 Merge master 2013-03-01 23:11:03 +01:00
Georg Ehrke
ff9476b3e3 fix oc#47 2013-03-01 18:30:25 +01:00
Lukas Reschke
dee16deacd Merge master 2013-02-28 20:03:06 +01:00
Bart Visscher
294403fa99 The router base url is without / on the end 2013-02-28 18:02:26 +01:00
Jan-Christoph Borchardt
fbb989f548 up limit of share dropdown from 4 to 15, scrollbar after 4 1/2 entries, fix #135 2013-02-28 12:07:56 +01:00
Jan-Christoph Borchardt
a2147c4f89 Merge pull request #1973 from owncloud/share-improvements 
reduce minimum length for username suggestions in share dialog, fix #1666
 2013-02-27 15:07:07 -08:00
Jenkins for ownCloud
a93b5b47a1 [tx-robot] updated from transifex 2013-02-28 00:05:40 +01:00
Lukas Reschke
b93ebe1860 Merge master 2013-02-27 23:36:52 +01:00
Lukas Reschke
39e28c0170 Typo... 2013-02-27 23:19:38 +01:00
Lukas Reschke
6f14bec70a Add a missing ) 2013-02-27 23:15:18 +01:00
Lukas Reschke
229c907a57 [core] From echo to p 2013-02-27 22:55:39 +01:00
Lukas Reschke
40e51d13d2 Remove uneeded file 2013-02-27 22:35:37 +01:00
Bernhard Posselt
9508a58c79 Merge pull request #1944 from owncloud/query-caching-upgrade 
Disable prepared query caching while doing an upgrade
 2013-02-27 12:48:42 -08:00
Jan-Christoph Borchardt
e01ab04d2b reduce minimum length for username suggestions in share dialog, fix #1666 2013-02-27 17:57:53 +01:00
Jenkins for ownCloud
fd654e9c2f [tx-robot] updated from transifex 2013-02-27 14:37:12 +01:00
Bernhard Posselt
a09076c3ac Merge pull request #1955 from owncloud/login-button-alignment 
quick fix for log in button not being aligned with input fields
 2013-02-27 04:05:47 -08:00
Bernhard Posselt
0828bb7e0e Merge pull request #1957 from owncloud/fix-895 
Fix 895
 2013-02-27 03:10:29 -08:00
Thomas Müller
58b06c5c9a Merge pull request #1905 from owncloud/fix-share-icons 
Fix adding share icons to share action
 2013-02-27 02:31:52 -08:00
Jan-Christoph Borchardt
a5d84b74d0 properly align triangle and unshare icons to text, also fixes line hopping 2013-02-27 11:30:33 +01:00
Jan-Christoph Borchardt
7ee5b2df13 fix ugly giant triangles 2013-02-27 11:30:06 +01:00
Jan-Christoph Borchardt
49cd9f20a6 fix shared by text going out of box, fix #895 2013-02-27 11:22:13 +01:00
Jan-Christoph Borchardt
f36d92bbc1 Merge pull request #1800 from raghunayyar/sharing-dropdown-fixes 
Various Layout Fixes for Sharing Dropdown.
 2013-02-27 02:19:35 -08:00
Jan-Christoph Borchardt
86ffa28f72 quick fix for log in button not being aligned with input fields 2013-02-27 11:04:08 +01:00
Jenkins for ownCloud
348812f2ce [tx-robot] updated from transifex 2013-02-27 00:09:33 +01:00
Robin Appelman
47b899e0c8 Disable prepared query caching while doing an upgrade 2013-02-26 22:41:48 +01:00
Bart Visscher
aa8bf3bbaa Merge pull request #1941 from owncloud/session_heartbeat 
generate url only once for heartbeat
 2013-02-26 11:49:59 -08:00
Bernhard Posselt
a65b16f3e7 generate url only once 2013-02-26 20:45:25 +01:00
Lukas Reschke
d3aecdab09 Merge pull request #1939 from owncloud/session_heartbeat 
use 15 min instead of 15 sec timeout
 2013-02-26 11:28:15 -08:00
Bernhard Posselt
81bb4363a2 use 15 min instead of 15 sec timeout 2013-02-26 20:25:07 +01:00
Frank Karlitschek
7eec31567f Merge pull request #1938 from owncloud/session_heartbeat 
implemented a heartbeat request which is calls the server every 15 minut...
 2013-02-26 11:02:09 -08:00
Bernhard Posselt
4e55348054 implemented a heartbeat request which is calls the server every 15 minutes to prevent a session timeout 2013-02-26 19:34:46 +01:00
Jan-Christoph Borchardt
6f09f57008 remove more unused logo files, now in promo 2013-02-26 14:28:17 +01:00
Jan-Christoph Borchardt
7a47786afd align logo type pixel perfectly 2013-02-26 14:27:29 +01:00
Frank Karlitschek
69eb69be0e Merge pull request #1902 from owncloud/angularcsp 
add CSP turned on for angularjs
 2013-02-26 00:58:12 -08:00
Frank Karlitschek
072daf8850 Merge pull request #1885 from houqp/issue_1776 
when user changes displayName, also update it on expand button
 2013-02-26 00:19:42 -08:00
Michael Gapczynski
5b732ac1ea Move space 2013-02-25 20:52:01 -05:00
Michael Gapczynski
aa2ea9e3de Fix adding share icons to share action 2013-02-25 20:20:29 -05:00
Jenkins for ownCloud
63d9feb8c0 [tx-robot] updated from transifex 2013-02-26 00:06:26 +01:00
Qingping Hou
195b52cb63 Merge branch 'master' of github.com:owncloud/core into issue_1776 
Conflicts:
	core/templates/layout.user.php
 2013-02-25 17:16:03 -05:00
Bernhard Posselt
b537cecdf3 add CSP turned on for angularjs 2013-02-25 22:54:05 +01:00
Lukas Reschke
6735701c1e Merge pull request #1837 from owncloud/fix-user-template 
Remove unneeded code for user layout template
 2013-02-25 13:41:32 -08:00
Thomas Müller
6dd1d479da Merge pull request #1706 from owncloud/master-sqlserver 
Microsoft SQL-Server support for ownCloud!
 2013-02-25 12:50:32 -08:00
Qingping Hou
c111a3aa24 add span tag to displayname on expand button 2013-02-25 15:40:57 -05:00
Thomas Müller
7c30c1a2e8 Merge pull request #1833 from owncloud/fix_1465 
Fix 1465
 2013-02-25 04:34:13 -08:00
Jenkins for ownCloud
21f3291eee [tx-robot] updated from transifex 2013-02-25 00:06:17 +01:00
Jenkins for ownCloud
6aa0ecc9b8 [tx-robot] updated from transifex 2013-02-23 00:05:33 +01:00
Thomas Mueller
9898ba4daf Merge branch 'master' into master-sqlserver 
Conflicts:
	core/templates/installation.php
 2013-02-22 22:59:09 +01:00
Jörn Friedrich Dreyer
e8da90d0f4 Merge pull request #1711 from owncloud/style-cleanup 
Codestyle cleanup
 2013-02-22 07:02:51 -08:00
Bart Visscher
bf0b9bac8b Remove unneeded code for user layout template 2013-02-22 00:22:43 +01:00
Bart Visscher
59582e0f3f Fix review issues 2013-02-22 00:21:06 +01:00
Jenkins for ownCloud
734a463297 [tx-robot] updated from transifex 2013-02-22 00:08:47 +01:00
Bart Visscher
19c5213b53 Join split translated strings 2013-02-21 23:47:56 +01:00
Bart Visscher
1a747b3e48 Style cleanup core dir 2013-02-21 23:47:21 +01:00
Jan-Christoph Borchardt
e7d1bbfae3 fix giant advanced caret in installation 2013-02-21 18:20:14 +01:00
Jörn Friedrich Dreyer
0dd7fd0599 IE8 does not support window.onclick 2013-02-21 17:38:25 +01:00
Arthur Schiwon
eceb7341bb make number-input fields look like they should 2013-02-21 16:25:47 +01:00
Jenkins for ownCloud
dcd93a53e4 [tx-robot] updated from transifex 2013-02-21 00:15:58 +01:00
Brice Maron
4f4e81d3d2 Add message when trouble sending email ref #1799 2013-02-20 21:14:55 +01:00