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

7868 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin Appelman
a922eb756e merge master into filesystem 2012-11-18 14:07:52 +01:00
Thomas Müller
ea80a8b9e3 Merge pull request #114 from riso/xsendfile 
Implement X-Sendfile support
 2012-11-18 04:35:46 -08:00
Jenkins for ownCloud
e28d71bf55 [tx-robot] updated from transifex 2012-11-18 00:02:00 +01:00
Thomas Müller
f3ae43d94a Merge pull request #420 from libasys/bugfix-share 
If you using the sharing by link the array monthNames don't exist and ca...
 2012-11-17 14:47:24 -08:00
Thomas Müller
87c45b1651 Merge pull request #503 from eMerzh/add_ua_request 
Add User agent when OC does a request
 2012-11-17 14:22:37 -08:00
Brice Maron
4337e0fb99 Little case fix 2012-11-17 22:12:24 +00:00
Brice Maron
71adad8817 Add User agent when OC does a request 2012-11-17 21:08:58 +00:00
Thomas Müller
ac3e962732 Merge pull request #375 from tdevos/master 
Use curl to get remote file content
 2012-11-17 12:31:25 -08:00
Thomas Müller
9e9bf20b07 Merge pull request #495 from owncloud/fix_issue_262 
Fix lostpassword url generation
 2012-11-17 02:09:40 -08:00
Jenkins for ownCloud
61670184c4 [tx-robot] updated from transifex 2012-11-17 00:02:24 +01:00
Bart Visscher
03b8ba273a Fix lostpassword url generation 
Fixes issue #262
 2012-11-16 22:01:24 +01:00
Bart Visscher
b03eca5ee2 Merge pull request #471 from owncloud/461_drag_drop_upload_to_folder 
refs #461 - drag'n'drop upload to a sub folder is working now
 2012-11-16 07:46:50 -08:00
Robin Appelman
3358bface5 fix incorectly merged versions.php 2012-11-16 12:24:28 +01:00
Robin Appelman
54240140b1 fix incorectly merged smb.php 2012-11-16 12:14:29 +01:00
Robin Appelman
f4f00b4edb Merge branch 'master' into filesystem 2012-11-16 12:13:03 +01:00
Thomas Mueller
4a3b5125cf adding comments on the form array indexes 2012-11-16 11:58:33 +01:00
Thomas Mueller
2b192a75c4 normalize the path once in upload.php is enough - THX Robin for this hint 2012-11-16 11:50:57 +01:00
Thomas Mueller
7af4cf48c9 refs #461 - drag'n'drop upload to a sub folder is working now 2012-11-16 10:23:40 +01:00
Thomas Müller
d1c0f2a739 Merge pull request #454 from Raydiation/master 
Routing fixes
 2012-11-15 15:15:07 -08:00
Thomas Tanghus
b99213f7a7 Merge pull request #458 from owncloud/js_console_switch 
Very simple js console switcher.
 2012-11-15 15:05:47 -08:00
Jenkins for ownCloud
d86a368e54 [tx-robot] updated from transifex 2012-11-16 00:03:47 +01:00
Thomas Müller
36bf4e24f0 Merge pull request #433 from owncloud/user_setting_fixes 
User setting fixes
 2012-11-15 14:01:16 -08:00
Robin Appelman
288ecf318c add getFileInfo and getDirectoryContent to OC_Files for compatibility 2012-11-15 22:08:08 +01:00
Robin Appelman
5569f07e8d add OC_FilesystemView alias for compatibility 2012-11-15 22:04:48 +01:00
Robin Appelman
f94d62380f Merge branch 'master' into filesystem 2012-11-15 21:27:24 +01:00
thomas
d2047a00cf Remove parentheses in return, modify description, and fix a mistake 2012-11-15 20:46:17 +01:00
Thomas Tanghus
b51b9539d0 Very simple js console switcher. 2012-11-15 19:43:10 +01:00
Bart Visscher
9419913c06 Better place to check for user removal 2012-11-15 18:10:40 +01:00
Björn Schießle
8a93cc14f6 port of approved pull request #442 - 'Always set renaming to false, also if renaming was aborted, to finalize the operation and show the file actions again.' 2012-11-15 17:16:18 +01:00
Bernhard Posselt
defdbe3c10 removed unneeded callback checks in routes_request that could potentially fail 2012-11-15 15:07:01 +01:00
Bernhard Posselt
25e4a071ef fixed: this.routes_request is a deferred/promise 2012-11-15 15:01:21 +01:00
Bernhard Posselt
e642d18e26 When using routing in apps, no apps are loaded in the left navigation tree. To fix this: load apps for matching a request 2012-11-15 14:48:18 +01:00
Bernhard Posselt
bf20021b62 instead of warning via popup, write to console.warn 2012-11-15 14:48:18 +01:00
Bernhard Posselt
ad87bc4645 Prevent ajax race conditions when using routes by offering a callback that is run after the the routes have finished loading 2012-11-15 14:48:18 +01:00
Arthur Schiwon
fd060d4849 really check if mod_deflate is loaded 2012-11-15 10:35:53 +01:00
Arthur Schiwon
64a8a0c872 coding style 2012-11-15 10:35:44 +01:00
Arthur Schiwon
4a75c539ed Fix remote.php CSS+JS garbish on some systems 2012-11-15 10:35:34 +01:00
Robin Appelman
cbcd9ba84a allow storage backends to implement custom permission management 2012-11-15 00:57:30 +01:00
Robin Appelman
bf2ac9f113 merge master into filesystem 2012-11-15 00:37:54 +01:00
Jenkins for ownCloud
a418a3ba65 [tx-robot] updated from transifex 2012-11-15 00:03:50 +01:00
thomas
40dd5ae61c change and transfert getUrlContent 2012-11-14 23:14:04 +01:00
Bernhard Posselt
14d4af24a2 Revert "Prevent ajax race conditions when using routes by offering a callback that is run after the the routes have finished loading" 
This reverts commit 9b8375cf2c.
 2012-11-14 23:09:15 +01:00
Bernhard Posselt
9b8375cf2c Prevent ajax race conditions when using routes by offering a callback that is run after the the routes have finished loading 2012-11-14 22:37:21 +01:00
Bart Visscher
343e9d8621 Better check and handing of user deletion 2012-11-14 21:52:28 +01:00
Bart Visscher
59627367ae Better check and handling of user creation 2012-11-14 21:52:28 +01:00
Bart Visscher
4eff27ed42 Always have the username as string in user admin 2012-11-14 21:52:28 +01:00
Bart Visscher
85209a0a00 Cleanup user settings js 2012-11-14 21:52:28 +01:00
Valerio Ponte
de7e419610 Fixed style according to owncloud styleguide 2012-11-14 20:10:20 +01:00
Valerio Ponte
8e190a5a97 Moved X-Sendfile headers into OC_Files::get 
now should work with temp files too
 2012-11-14 20:10:20 +01:00
Valerio Ponte
8420b9bf67 Implemented X-Sendfile support 2012-11-14 20:10:20 +01:00