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

13964 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vincent Petry
e257c3f27c Fixed array syntax to work with PHP 5.3 
It seems that array brackets are only supported starting with PHP 5.4.
Fixed the array brackets to be compatible and not cause a syntax error
in PHP 5.3.
 2013-10-04 14:28:11 +02:00
Björn Schießle
31d5565a18 Merge pull request #4689 from owncloud/sharing_mail_notification_master 
send mail notification if a file was shared to a user/group
 2013-10-04 04:06:37 -07:00
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
Morris Jobke
c38638fdf4 Merge pull request #4815 from owncloud/ldap_improve_testing 
LDAP modularization and tests
 2013-10-04 02:41:06 -07:00
Björn Schießle
5b7f76e702 Merge pull request #4691 from owncloud/encryption_improved_error_messages_4617 
Encryption improved error messages
 2013-10-04 02:28:18 -07:00
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
Jan-Christoph Borchardt
13218ec689 remove duplicate upload CSS from files.css 2013-10-03 17:08:29 +03: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 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
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
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
Morris Jobke
ceeb22aa5f fix unit tests 2013-10-02 11:25:44 +02: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
Owen Winkler
535ed8369f Merge pull request #4894 from owncloud/fixing-4620-master 
Fixing broken layout in master due to APC enabled
 2013-10-01 17:51:33 -07:00
Victor Dubiniuk
5bb4330ea4 Fix autoloader regression 2013-10-02 00:58:51 +03:00
Thomas Müller
9eab8b39df Merge branch 'master' into fixing-4620-master 2013-10-01 22:57:46 +02:00