Björn Schießle
1992450b32
Merge pull request #4902 from owncloud/repeat_recovery_password
...
let user repeat the recovery key password to prevent typos
2013-10-04 02:23:01 -07:00
Vincent Petry
9d2595a7c5
Shortened notification message that was too long
...
The message for invalid private key was too long and didn't fit in the
notification box. This fix reduces the message to fit properly by
removing the extra information.
2013-10-04 11:11:24 +02:00
Bjoern Schiessle
b7c3af11bf
fix hidden fieled name
2013-10-04 10:46:55 +02:00
Bjoern Schiessle
47f59d2e42
we don't know \OCA\Encryption\Session if the encryption app is not enabled, so we have to set the status manually
2013-10-04 10:37:58 +02: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
Frank Karlitschek
47666796a7
ups. remove debug
2013-10-04 09:42:38 +02:00
Frank Karlitschek
e49ee47e7b
use Filesystem::isIgnoredDir
2013-10-04 09:28:46 +02:00
Frank Karlitschek
f0a98cc923
fix typo
2013-10-04 09:25:54 +02:00
Frank Karlitschek
6d95436695
add public static
2013-10-04 09:24:07 +02:00
Morris Jobke
889a09c8fe
Merge pull request #5100 from owncloud/autotest-backupconfig
...
Added backup for config.php in autotest.sh script
2013-10-03 23:47:27 -07:00
Frank Karlitschek
38f68d09db
Merge pull request #5108 from owncloud/fix_avatar_kondou
...
Hide defaultavatar in #header and don't darken proper avatars in #header
2013-10-03 23:27:41 -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
Markus Goetz
7f7718888d
DAV: Use fileinfo_cache for ETag
2013-10-03 17:09:08 +02:00
Jan-Christoph Borchardt
13218ec689
remove duplicate upload CSS from files.css
2013-10-03 17:08:29 +03:00
Jan-Christoph Borchardt
3c13afee98
better style and color for warning and success feedback on inputs
2013-10-03 16:58:48 +03:00
Jan-Christoph Borchardt
f3e0cbdeed
fix position of New and Deleted Files buttons
2013-10-03 16:49:49 +03:00
Jan-Christoph Borchardt
308d4383a3
simplify input elements for less cognitive load. No box-shadow, no text-shadow, smaller border-radius
2013-10-03 16:35:42 +03:00
Vincent Petry
006799616d
Fixed missing default values
...
Added default value for $fromTime to prevent missing argument errors and
keep backward compatible.
2013-10-03 14:21:41 +02:00
Vincent Petry
b0bb64c3ee
Added unit tests for relative_modified_date, changed method signature
...
Changed method signature of relative_modified_date template method to
make it possible to add a fromTime to compare with, mostly to make it
possible to test it.
Added unit test for date and time cases.
2013-10-03 13:55:05 +02:00
Vincent Petry
9cf25c8048
Added backup for config.php in autotest.sh script
...
The script now checks for config.php existance and backs it up before
running the test, then restores it back at the end. This avoids the
situation where devs lose their manually edited config if they forgot to
back it up before running the unit tests.
The script now also checks for config.php permissions beforehand to
avoid displaying an annoying HTML page output in the console with an
error message.
2013-10-03 12:53:13 +02:00
Morris Jobke
5501dd623e
add/remove specific CSS class - not all classes
2013-10-03 12:22:25 +02:00
Vincent Petry
d09b1553d0
Fixed syntax error in array
2013-10-03 11:31:21 +02:00
Thomas Tanghus
aedc427ffd
Fix fix of POST :P
2013-10-03 03:56:37 +02:00
Thomas Tanghus
8a018d7a59
Fix POST decoding
2013-10-03 01:43:33 +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
Thomas Müller
de175a4b0f
Merge pull request #5077 from owncloud/no-upgrade-if-there-is-no-fscache-table-master
...
only perform files upgrade in case there are actually entries in the old...
2013-10-02 14:24:38 -07:00
Thomas Tanghus
965ce5719f
Modified PUT behaviour
...
Now only non-parable PUT requests return a stream resource.
2013-10-02 22:13:40 +02:00
Jan-Christoph Borchardt
f8093699f7
Merge pull request #5093 from owncloud/file-actions
...
File Selected on Click instead of download.
2013-10-02 09:56:08 -07:00
Raghu Nayyar
c87b9fafc4
Merge pull request #5095 from owncloud/design-finetune
...
Whitespace fix for share.css
2013-10-02 09:47:02 -07:00
raghunayyar
0d5653c6b1
Takes nametext inside the anchor tag to fix the issue completely.
2013-10-02 22:11:03 +05:30
Morris Jobke
99fa4898fd
just fix whitespace stuff
2013-10-02 18:27:55 +02:00
Frank Karlitschek
6d150b8d3c
Merge pull request #5092 from owncloud/design-finetune
...
Design finetune
2013-10-02 09:27:29 -07:00
raghunayyar
4a5f3442b5
Closes Label inside the a tag for not hiding the fileactions.
2013-10-02 21:40:34 +05:30
raghunayyar
81b4904c78
File Selected on Click instead of download.
2013-10-02 21:13:07 +05:30
Jan-Christoph Borchardt
5feaa55779
simplify From Link icon in New menu
2013-10-02 18:27:39 +03:00
Jan-Christoph Borchardt
9853b33420
reduce rounded corners of New dropdown
2013-10-02 18:04:08 +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
Vincent Petry
ed14541aea
Removed stray debug log write
2013-10-02 16:44:38 +02:00
Bjoern Schiessle
b0a71bde15
maxX and maxY should be a integer
2013-10-02 16:34:05 +02:00
Vincent Petry
31e1c15db7
Added dateOnly argument to relative_modified_date
...
Improved the template function relative_modified_date by adding an
optional dateOnly argument which will output "today" or "yesterday" or
"x days ago".
2013-10-02 15:52:44 +02:00
Bjoern Schiessle
eb1216f949
add previews to versions dialog
2013-10-02 15:23:51 +02:00
Morris Jobke
551e809790
Merge pull request #5076 from owncloud/fix_filepicker_kondou
...
Fix require in apps/files/ajax/rawlist.php
2013-10-02 05:59:24 -07:00
Thomas Müller
78c60c25c8
only perform files upgrade in case there are actually entries in the old fscache table
2013-10-02 13:00:05 +02:00
kondou
feb7028a78
Remove require in rawlist.php
...
Thanks @tanghus for pointing out the unneccessity of it.
2013-10-02 12:45:30 +02:00
kondou
013e9c27d2
Fix require in apps/files/ajax/rawlist.php
2013-10-02 12:21:52 +02:00
Thomas Müller
1adadf36fc
Merge pull request #5071 from owncloud/fix-autoloader-master
...
Fix autoloader regression
2013-10-02 03:10:10 -07:00