Bjoern Schiessle
|
51295e9a6b
|
Merge branch 'master' into sharing_mail_notification_master
Conflicts:
apps/files/index.php
apps/files/templates/index.php
|
2013-10-04 12:30:49 +02:00 |
Bjoern Schiessle
|
a223cf769a
|
Merge branch 'sharing_mail_notification_master' of github.com:owncloud/core into sharing_mail_notification_master
Conflicts:
core/ajax/share.php
|
2013-10-04 12:27:18 +02:00 |
Bjoern Schiessle
|
304803d102
|
fix array_diff call
|
2013-10-04 12:23:40 +02:00 |
Thomas Müller
|
514d7a884a
|
Merge pull request #5107 from owncloud/user_skeleton
make it possible to prepopulate a new user home with a skeleton
|
2013-10-04 02:57:17 -07:00 |
Frank Karlitschek
|
566d826a9e
|
add a real examplefile instead of an .gitignore which is a bit stupid here
|
2013-10-04 10:21:33 +02:00 |
Morris Jobke
|
ecd2bf2a55
|
Merge pull request #5109 from owncloud/controls-bar-height
Controls bar height
|
2013-10-04 01:01:54 -07:00 |
Jan-Christoph Borchardt
|
c335169f6d
|
increase height of controls bar and elements to more clickable 44px
|
2013-10-04 08:41:16 +03:00 |
kondou
|
b0ff10a536
|
Hide defaultavatar in #header and don't darken proper avatars in #header
|
2013-10-04 02:27:53 +02:00 |
Frank Karlitschek
|
e40afbebc6
|
make it possible to prepopulate a new user gome with a skeleton
|
2013-10-03 23:22:11 +02:00 |
Vincent Petry
|
d09b1553d0
|
Fixed syntax error in array
|
2013-10-03 11:31:21 +02:00 |
Thomas Müller
|
9c23c3449b
|
Merge branch 'master' into sharing_mail_notification_master
Conflicts:
core/css/share.css
|
2013-10-02 23:33:50 +02:00 |
Morris Jobke
|
99fa4898fd
|
just fix whitespace stuff
|
2013-10-02 18:27:55 +02:00 |
Jan-Christoph Borchardt
|
5feaa55779
|
simplify From Link icon in New menu
|
2013-10-02 18:27:39 +03:00 |
Jan-Christoph Borchardt
|
c548edd90f
|
remove box-shadows for header, navigation and controls bar - looks sharper and less washed out
|
2013-10-02 17:59:38 +03:00 |
Jan-Christoph Borchardt
|
8ce26297b9
|
reduce rounded corners of Share and Versions dropdown
|
2013-10-02 17:53:54 +03:00 |
Bjoern Schiessle
|
8b08b1b455
|
Merge branch 'master' into sharing_mail_notification_master
Conflicts:
lib/private/util.php
|
2013-10-02 10:11:18 +02:00 |
Thomas Müller
|
b58a464b86
|
Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabled
don't remember login if the encrypion app is enabled
|
2013-09-30 10:53:41 -07:00 |
Jenkins for ownCloud
|
a711399e62
|
[tx-robot] updated from transifex
|
2013-09-30 10:19:22 -04:00 |
Bjoern Schiessle
|
084f76fd14
|
grammar fixes
|
2013-09-30 13:33:49 +02:00 |
Bjoern Schiessle
|
17aa49a890
|
fix mail subject; don't show time for expire date
|
2013-09-30 13:33:02 +02:00 |
Bjoern Schiessle
|
b9a1f63344
|
go back to old template but add expire date as optional content
|
2013-09-30 10:02:26 +02:00 |
Alessandro Cosentino
|
710d3f139f
|
followup of #4032 - makes the settings-button bigger and adds again padding at bottom of app-navigation
|
2013-09-29 01:46:23 -04:00 |
Jenkins for ownCloud
|
59e4ff7d24
|
[tx-robot] updated from transifex
|
2013-09-29 00:03:26 -04:00 |
kondou
|
4907685405
|
Base defaultavatar text on displayname
Fix #4876
|
2013-09-28 16:46:53 +02:00 |
Jenkins for ownCloud
|
f31d31844e
|
[tx-robot] updated from transifex
|
2013-09-27 00:02:30 -04:00 |
Björn Schießle
|
6b1d70f148
|
Merge pull request #4887 from owncloud/sharing_disable_public_upload
check only permission from link-share to decide if public upload is enabled or disabled
|
2013-09-26 03:16:15 -07:00 |
Morris Jobke
|
70dccd28ef
|
Merge pull request #4987 from owncloud/different_color_placeholder
Make it possible to have a different color than the username for placeholder
|
2013-09-25 10:11:52 -07:00 |
kondou
|
5e7a7b3f61
|
Shorten optional text-argument processing
|
2013-09-25 17:19:38 +02:00 |
kondou
|
24eb41548e
|
Make it possible to have a different color than the username for placeholder
|
2013-09-25 12:57:41 +02:00 |
Bjoern Schiessle
|
883d1c0df3
|
use template for txt and html mails to send notification mails
|
2013-09-25 11:51:28 +02:00 |
Jenkins for ownCloud
|
2d12e52769
|
[tx-robot] updated from transifex
|
2013-09-24 12:59:48 -04:00 |
Bjoern Schiessle
|
6d0987bdb4
|
some small js fixes
|
2013-09-24 18:32:57 +02:00 |
Bjoern Schiessle
|
c486fc7608
|
introduce OC_Util::rememberLoginAllowed()
|
2013-09-24 18:01:34 +02:00 |
Bjoern Schiessle
|
b693b5085c
|
don't remember login if the encrypion app is enabled because the user
needs to log-in again in order to decrypt his private key with his password
|
2013-09-24 13:08:55 +02:00 |
Bjoern Schiessle
|
fc76a13c52
|
Merge branch 'master' into sharing_mail_notification_master
Conflicts:
lib/public/share.php
|
2013-09-23 11:18:00 +02:00 |
Björn Schießle
|
9851f0f4f2
|
Merge pull request #4896 from owncloud/sharing_allow_disable_password
sharing, allow user to disable password protection
|
2013-09-23 01:20:09 -07:00 |
Jenkins for ownCloud
|
28918d61d2
|
[tx-robot] updated from transifex
|
2013-09-22 12:58:42 -04:00 |
Jenkins for ownCloud
|
5b95e7aa0f
|
[tx-robot] updated from transifex
|
2013-09-20 10:50:14 -04:00 |
Bjoern Schiessle
|
71e129f295
|
initialize variable
|
2013-09-20 15:47:33 +02:00 |
Bjoern Schiessle
|
12b4e79201
|
calculate correct permissions while toggle the password protection
|
2013-09-20 13:11:05 +02:00 |
Bart Visscher
|
8e26f291a7
|
Merge pull request #4684 from owncloud/improved-console
Use more object oriented way for console commands
|
2013-09-19 14:22:32 -07:00 |
Bart Visscher
|
f9549a4465
|
Merge pull request #4908 from owncloud/fix_css_selector
css selectors never have a : before []
|
2013-09-19 10:59:45 -07:00 |
Bart Visscher
|
a9ea99e93d
|
Add copyright, remove starting blank line
|
2013-09-19 19:12:16 +02:00 |
Jörn Friedrich Dreyer
|
7e0631b3b8
|
Merge branch 'master' into fix_3728_with_file_exists_dialog
Conflicts:
apps/files/js/filelist.js
|
2013-09-19 17:00:54 +02:00 |
Jörn Friedrich Dreyer
|
9f9eb1b08f
|
Merge pull request #4263 from owncloud/search_scrollto
initial scrollto implementation
|
2013-09-19 05:49:45 -07:00 |
Jörn Friedrich Dreyer
|
078bf0df25
|
use {count} instead of 'One' for more versatile translation
|
2013-09-19 12:05:30 +02:00 |
Jörn Friedrich Dreyer
|
a6933efce3
|
use n to translate title
|
2013-09-19 11:25:41 +02:00 |
Jörn Friedrich Dreyer
|
cda58ae3df
|
css selectors never have a : before []
|
2013-09-19 10:14:07 +02:00 |
Jörn Friedrich Dreyer
|
0d81a53e12
|
use 96x96 as 64x64 thumbnails in conflicts dialog, 64x64 looks very blocky ... maybe something is wrong there
|
2013-09-19 10:00:42 +02:00 |
Jörn Friedrich Dreyer
|
f7800cd63e
|
fix 'event is not defined' error
|
2013-09-19 09:47:51 +02:00 |