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

26097 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philippe Le Brouster
12b751ddc9 Fix the config.php owner check for console.php 
The config directory must be taken from OC::$configDir

Minor fix

 - Remove uneeded slash in the configdir path.
 2015-07-09 23:19:52 +02:00
Morris Jobke
c86e742e67 Merge pull request #15586 from Egari/addThemeSupportToMimeIcon 
Add theme support to mimetypeIcon through imagePath integration
 2015-07-09 23:02:46 +02:00
Morris Jobke
42eb18c747 Merge pull request #17473 from owncloud/enc_fix_migration 
more secure way to update the database
 2015-07-09 22:41:56 +02:00
Morris Jobke
28e4542b58 Merge pull request #17530 from owncloud/proper-config-for-singleuser-command 
[command] single user mode - use config object & add tests
 2015-07-09 22:20:02 +02:00
Roeland Jago Douma
eb7a796ad9 Fix unit tests 2015-07-09 18:42:46 +02:00
Morris Jobke
08afce3d7e [command] single user mode - use config object & add tests 2015-07-09 18:33:46 +02:00
Morris Jobke
d52e197b0d Merge pull request #16965 from owncloud/getUserFolder-in-IRootFolder 
Add getUserFolder to IRootFolder
 2015-07-09 14:29:47 +02:00
Roeland Jago Douma
eea56dc309 MimeTypes now also supports httpd/unix-directory 
Since we both use dir and httpd/unix-directory in OC they should map to
the same icon.

Fixes #17527
 2015-07-09 14:19:31 +02:00
Roeland Jago Douma
7d943b2ddc Make the filelist get the mimetypeicon from the mimetype 2015-07-09 13:56:43 +02:00
Roeland Jago Douma
a727cbc7a9 Remove ajax/mimeicon.php and its route 2015-07-09 13:40:13 +02:00
Roeland Jago Douma
5c381ea532 Move calls to Files.getMimeIcon to OC.MimeType.getIconUrl 2015-07-09 13:40:13 +02:00
Roeland Jago Douma
1aa2f6638f Make getMimeIcon use OC.MimeType.getIconUrl 2015-07-09 13:40:12 +02:00
Thomas Müller
d3b58d147f Allow upgrade of not enabled apps 2015-07-09 12:37:57 +02:00
Arthur Schiwon
bfdf39b9bd LDAP: when checking group for matching filter, also take base DN into consideration. Fixes #17516 2015-07-09 12:19:04 +02:00
RealRancor
e62c375749 Fixed "Remote IP:" syntax on failed logins 2015-07-09 10:04:51 +02:00
Morris Jobke
2b86ba43e3 Merge pull request #14341 from rullzer/public_share_do_not_leak_mounttype 
No more leaking of mounttype via metadata or icon in public shares.
 2015-07-09 09:41:27 +02:00
Jenkins for ownCloud
6d9bb17360 [tx-robot] updated from transifex 2015-07-09 01:54:53 -04:00
Hendrik Leppelsack
4d289dc590 fix browser compatibility issue for element.closest 2015-07-08 22:58:08 +02:00
Thomas Müller
201607332b Merge pull request #17498 from owncloud/add-db-indexes 
Add indexes to speedup DB queries
 2015-07-08 20:41:17 +02:00
Bjoern Schiessle
1e284b15ff only create new key pair if both keys are missing 2015-07-08 19:08:41 +02:00
Morris Jobke
19f34bafa5 Merge pull request #17472 from RealRancor/add_is_dir 
Add is_dir check to getAllApps() function
 2015-07-08 18:30:45 +02:00
Bjoern Schiessle
85c3b9d5cf only cleanUp the remaining keys if the migration really finished succesfully 2015-07-08 18:23:18 +02:00
Morris Jobke
4a37d565bd Add indexes to speedup DB queries 
* file_target is often used in the sharing code in JOIN statements for retrieval of shares
 2015-07-08 18:04:10 +02:00
Roeland Jago Douma
895d29adf1 Move mimetypemapping.json to mimetypemapping.dist.json 
This allows users to create their own mapping file to extend our current
mappings. This makes sure that custom mappings are not lost on OC
upgrades.
 2015-07-08 17:16:12 +02:00
Bjoern Schiessle
876d7c160d more secure way to update the database 2015-07-08 13:26:53 +02:00
Roeland Jago Douma
35fba1ef9f Move mimetypes.list.php to config/mimetypemapping.json 
This allows users to add new mimetypemappings (extention -> mimetype)
themself. And not have to wait until a new release for updated
mimetypes.

Fixes: #15384
 2015-07-08 13:18:58 +02:00
Bjoern Schiessle
db65eeb580 only move real files to the trash bin 2015-07-08 11:32:06 +02:00
Hendrik Leppelsack
03a6e12bdb fix tipsy dependency 2015-07-08 10:55:53 +02:00
Hendrik Leppelsack
6f547a9960 fix tipsy not updating on reinitialization 2015-07-08 10:53:17 +02:00
Morris Jobke
0fe81d2f21 Merge pull request #17330 from owncloud/fix-share-path-for-group-exceptions 
Fix the path for users which have an exception for a group share
 2015-07-08 10:33:42 +02:00
RealRancor
1300204586 Add is_dir check to getAllApps() function 2015-07-08 10:25:39 +02:00
Jenkins for ownCloud
2fd84607ee [tx-robot] updated from transifex 2015-07-08 01:55:28 -04:00
Morris Jobke
e0e4ca668f Merge pull request #17432 from owncloud/enhance-config-sample 
[config sample] improve RST markup and wording
 2015-07-07 22:12:38 +02:00
Morris Jobke
4d75db0e54 Merge pull request #17439 from owncloud/update-3rdpartytext 
Remove 3rd party text for disabled apps on update
 2015-07-07 16:26:30 +02:00
Morris Jobke
10ea3f610d Merge pull request #17436 from owncloud/update-keeppageifwarnings 
Keep update page when there are warnings
 2015-07-07 16:25:30 +02:00
Morris Jobke
d68b48d86f [config sample] improve RST markup and wording 2015-07-07 15:57:38 +02:00
Morris Jobke
3f5aa27d49 refactoring into proper methods 2015-07-07 15:16:37 +02:00
Thomas Müller
76b399d923 Merge pull request #15579 from owncloud/autotest-docker-postgres 
autotest.sh with docker support for postgres
 2015-07-07 15:00:55 +02:00
Vincent Petry
a64652e12a Remove 3rd party text for disabled apps on update 2015-07-07 15:00:19 +02:00
Vincent Petry
d3e26a3127 Merge pull request #16368 from owncloud/occ-config-commands 
Add "occ config:*" to manage config values
 2015-07-07 14:49:31 +02:00
stolter
1fc188fd29 Add theme support to mimetypeIcon through imagePath integration 2015-07-07 14:38:14 +02:00
Morris Jobke
3d8297c254 Fix unit tests and introduce better mocks of the HTML 2015-07-07 13:56:49 +02:00
Morris Jobke
e557fe0aab Add proper download started feedback 
* this code adds a cookie when a special get parameter is set
* the content of this get parameter is used as value for the cookie
* the cookie expires after 20 seconds
* the JS code checks every 500 milliseconds for the cookie
  -> if the cookie is set the request returned and the download is started
 2015-07-07 13:56:49 +02:00
Morris Jobke
5a528214b8 Make download status fully visible 2015-07-07 13:56:49 +02:00
Morris Jobke
28a8697995 Reduce timeout for download spinner to 2 seconds 2015-07-07 13:56:49 +02:00
Morris Jobke
16c29021e6 Add loading spinner to multi select download button 2015-07-07 13:56:48 +02:00
Morris Jobke
0cdb46b5c6 Fix layout of disabled links in the file list 
* also disable download button after click
 2015-07-07 13:56:48 +02:00
Morris Jobke
28a51ef724 Add loading spinner to download icon 
* vanishes after 7 seconds
 2015-07-07 13:56:48 +02:00
Vincent Petry
993e7eeec7 Keep update page when there are warnings 
Whenever there were warnings during an update, the page will not be
redirected any more.
 2015-07-07 13:38:24 +02:00
Joas Schilling
85f012512e Invert the "public" to a "private" method 2015-07-07 11:30:21 +02:00