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

4778 commits

Author SHA1 Message Date
Thomas Müller
9ab44f1f00 Merge pull request #11509 from owncloud/internal_email_template 
Allow separate templates for internal and external share notifications
 2015-10-29 11:27:05 +01:00
Thomas Müller
f000edb636 Merge pull request #19871 from owncloud/issue-19583-invalid-shares 
Issue 19583 invalid shares
 2015-10-29 10:43:50 +01:00
Stephen Colebrook
6feb31bf96 Allow separate templates for internal and external share notifications 2015-10-29 10:24:24 +01:00
Joas Schilling
e5a7e3124a Add a repair step that checks for group membership on shares 2015-10-29 09:26:26 +01:00
Tom Needham
628e4a9daf Add sharee list view js tests 2015-10-29 09:01:47 +01:00
Jenkins for ownCloud
527ef76dd6 [tx-robot] updated from transifex 2015-10-29 01:55:45 -04:00
Thomas Müller
f8012fd734 Merge pull request #20097 from owncloud/revert-19508 
Revert "setting to skip migration tests by default"
 2015-10-28 09:19:53 +01:00
Jenkins for ownCloud
d74811fcc8 [tx-robot] updated from transifex 2015-10-28 01:55:29 -04:00
Morris Jobke
3b249f1967 Revert "setting to skip migration tests by default" 
This reverts commit 7cbdd9b90b.
 2015-10-27 21:25:11 +01:00
Thomas Müller
588a668455 Merge pull request #20082 from owncloud/phil-davis-sharedialogviewspec-typos 
sharedialogviewSpec.js couple of text typos
 2015-10-27 20:04:05 +01:00
Thomas Müller
c15b2094e5 Merge pull request #20078 from owncloud/tipsy-body 
Append tipsys to body
 2015-10-27 15:08:25 +01:00
Phil Davis
89ab505c7b sharedialogviewSpec.js couple of text typos 
I noticed a new typo in 15ef39d5b9 and looked for others while I am here.
 2015-10-27 17:11:49 +05:45
Hendrik Leppelsack
5a01dc44d6 append tipsys to body 2015-10-27 11:22:41 +01:00
Thomas Müller
8c33c5260a Merge pull request #19824 from owncloud/ie9-share-donotsendplaceholderaspassword 
[IE9] Don't send link share password placeholder
 2015-10-27 09:57:39 +01:00
Jenkins for ownCloud
0875a4a18f [tx-robot] updated from transifex 2015-10-27 01:55:44 -04:00
Vincent Petry
0d98e5e456 [IE9] Don't send link share password placeholder 
When exiting the password field in the share dialog, IE9 would
mistakenly think that the password has changed and would send the
placeholder.

This fix prevents changing the password whenever the placeholder is set
as value.
 2015-10-26 17:45:21 +01:00
Thomas Müller
40ba8d267f Merge pull request #19837 from owncloud/always-enabled-apps 
Store list of apps which cannot be disabled in shipped.json
 2015-10-26 17:14:29 +01:00
Thomas Müller
23e51c37cf Merge pull request #20049 from owncloud/make-author-file-complete 
Generate author file by license.php build script
 2015-10-26 17:14:06 +01:00
Lukas Reschke
8f09d5b67c Update license headers 2015-10-26 14:04:01 +01:00
Vincent Petry
c64fb46fbf Fix share link focus on click 
Clicking on the link share must focus and select it
 2015-10-26 12:49:52 +01:00
Thomas Müller
d4d954b2d9 Merge pull request #19982 from owncloud/fix-link-sharing-regression-master 
Ensure the password is only hashed in case it's changed on the client…
 2015-10-26 10:57:31 +01:00
Thomas Müller
6fc59f85b6 Store list of apps which cannot be disabled in shipped.json 2015-10-26 09:53:04 +01:00
Jenkins for ownCloud
eb10e3abc2 [tx-robot] updated from transifex 2015-10-25 01:55:04 -04:00
Jenkins for ownCloud
ba010a5aa4 [tx-robot] updated from transifex 2015-10-24 01:55:42 -04:00
Thomas Müller
db48a937cf Merge pull request #19990 from owncloud/stay-logged-in-wording 
change wording from 'remember' to more understandable 'Stay logged in'
 2015-10-23 10:49:51 +02:00
Roeland Jago Douma
9071e756a1 Fix for broken ajax/share.php endpoint 
Even more code mess :(
All tests pass again. But I'm really not happy with this endpoint.
 2015-10-23 09:24:03 +02:00
Jenkins for ownCloud
a341e786dd [tx-robot] updated from transifex 2015-10-23 01:55:06 -04:00
Jan-Christoph Borchardt
aed9b2a626 change wording from 'remember' to more understandable 'Stay logged in' 2015-10-23 10:44:41 +13:00
Thomas Müller
4f5ff9c105 Ensure the password is only hashed in case it's changed on the client - fixes #19950 2015-10-22 17:32:40 +02:00
Thomas Müller
56fdb0ac93 Merge pull request #19935 from owncloud/issue-19916-settings-menu-hide-on-file-action 
Use the normal OC.menu JS for handling the Settings menu
 2015-10-22 10:42:02 +02:00
Thomas Müller
15ef39d5b9 Merge pull request #19952 from owncloud/share-dialogue-tests 
Add JS tests for share dialog
 2015-10-22 09:23:05 +02:00
Jenkins for ownCloud
c50bbb8cde [tx-robot] updated from transifex 2015-10-22 01:55:47 -04:00
Tom Needham
e3ae453ee5 Fix line lengths in share dialog unit tests 2015-10-21 13:30:42 +00:00
Thomas Müller
f7f2a160dd Merge pull request #19918 from owncloud/send-begin-message 
Update: state which step we are going to start and warn if it might b…
 2015-10-21 14:52:19 +02:00
Tom Needham
8a6d22d751 Add JS tests for share autocompletion handling 2015-10-21 12:46:08 +00:00
Joas Schilling
a0437591db Use the normal OC.menu JS for handling the Settings menu 2015-10-21 13:59:30 +02:00
Thomas Müller
036c8a2e56 Merge pull request #19936 from owncloud/DeepDiver1975-patch-1 
Remove the core version from shipped.json
 2015-10-21 13:53:33 +02:00
Thomas Müller
ae0f20471a Merge pull request #19923 from owncloud/apps-donotdisplaybrokenappiconininternetexplorer 
Disable app icon preview in apps page for IE
 2015-10-21 13:42:48 +02:00
Thomas Müller
c27531fe0f Remove the core version from shipped.json 2015-10-21 13:40:05 +02:00
Tom Needham
2ca5b1aa1f Add test for remote share info tooltop 2015-10-21 10:00:29 +00:00
Vincent Petry
89e3860e1a Disable app icon preview in apps page for IE 
All IE versions are not able to properly upscale SVG icons unless the
said SVG files contain a "viewBox" attribute, which is not always the
case. Also we cannot guarantee that all third party apps will have this
attribute in their icons.

So for now, app icons will not be displayed in IE instead of broken
ones.
 2015-10-21 10:50:06 +02:00
Joas Schilling
e66e67567f Update - Only add one section for disabled apps 2015-10-21 10:39:56 +02:00
Joas Schilling
9200bbeaba Update: state which step we are going to start and warn if it might be slow 2015-10-21 09:17:38 +02:00
Jenkins for ownCloud
74f41349b7 [tx-robot] updated from transifex 2015-10-21 01:56:16 -04:00
Vincent Petry
1e64968ff7 Allow leaving update page when errors occurred 2015-10-20 13:29:44 +02:00
Vincent Petry
06ddd40886 Prevent leaving the DB update page while in progress 2015-10-20 13:28:48 +02:00
Thomas Müller
5d9a9e8f3d Merge pull request #19878 from owncloud/fix-filepicker-loading-spinner 
fix filepicker loading spinner
 2015-10-20 11:04:12 +02:00
Jenkins for ownCloud
dfd44942c6 [tx-robot] updated from transifex 2015-10-20 01:55:03 -04:00
Christoph Wurst
9778094a25 fix filepicker loading spinner 2015-10-19 23:43:12 +02:00
Jenkins for ownCloud
008082ebad [tx-robot] updated from transifex 2015-10-19 01:55:02 -04:00