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

10900 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
cc9933be1c Merge pull request #3160 from owncloud/remove-onclick 
Remove onclick
 2013-04-29 03:58:44 -07:00
Jenkins for ownCloud
2b36ad292d [tx-robot] updated from transifex 2013-04-29 02:00:26 +02:00
Lukas Reschke
3a6e39b990 It's a class 2013-04-28 23:28:41 +02:00
Lukas Reschke
003e6adb3f Remove uneeded onclick handler 2013-04-28 23:26:07 +02:00
Lukas Reschke
6cf6103ed2 Move onclick handler 2013-04-28 23:25:58 +02:00
Frank Karlitschek
1f194b7bdc Merge pull request #3154 from owncloud/fix_3153 
Change app identifier for core api routes
 2013-04-28 03:51:21 -07:00
Jenkins for ownCloud
901e0c598d [tx-robot] updated from transifex 2013-04-28 02:01:38 +02:00
Lukas Reschke
51a1f41225 Merge pull request #3121 from owncloud/ocs_fix_api_response 
Fix the api response when a shipped and third party app both fail.
 2013-04-27 10:05:06 -07:00
Tom Needham
1e1a8b2f3c Fix typo 2013-04-27 17:52:37 +01:00
Tom Needham
66053693f8 Code style for ocs/routes.php 2013-04-27 17:51:36 +01:00
Tom Needham
59db762dfa Change app identifier for core api routes 2013-04-27 17:45:44 +01:00
Tom Needham
d33f6b9af6 Use correct variable when checking auth 2013-04-27 17:45:23 +01:00
Morris Jobke
0e5eccbdbc Merge pull request #3146 from owncloud/restart-hint 
web_server_restart needs to be true to display the hint
 2013-04-27 08:19:08 -07:00
Morris Jobke
86455d6ac3 Merge pull request #3145 from owncloud/magic_quotes_gpc-check 
Add check for Magic Quotes
 2013-04-27 08:14:40 -07:00
Raghu Nayyar
2bcb64e781 Merge pull request #3114 from owncloud/update-notification 
Add an update notification
 2013-04-26 21:12:38 -07:00
Jenkins for ownCloud
7b2c64236c [tx-robot] updated from transifex 2013-04-27 02:24:29 +02:00
Robin Appelman
8a838e0e03 Code style 2013-04-26 17:30:55 +02:00
Bart Visscher
7db5ec30c3 Add check for Magic Quotes 2013-04-26 16:32:58 +02:00
Bart Visscher
f5b0d904fb web_server_restart needs to be true to display the hint 2013-04-26 16:21:56 +02:00
icewind1991
5474fea1f6 Merge pull request #3136 from owncloud/mount-cleanup 
Separation of mount management
 2013-04-26 06:55:21 -07:00
Bart Visscher
d825669265 Merge pull request #3002 from owncloud/priorize_common_languages 
Priorize common languages.
 2013-04-26 06:30:59 -07:00
Bart Visscher
686f836736 Merge pull request #3026 from owncloud/cli-no-session 
Don't start the session when in cli mode
 2013-04-26 06:20:39 -07:00
Bart Visscher
948e3d5b7c Merge pull request #3028 from owncloud/simplyfy-resource-locating 
Simplify resource locating in templatelayout
 2013-04-26 05:56:09 -07:00
Robin Appelman
172499d5f3 Don't start the session when in cli mode 2013-04-26 14:53:59 +02:00
Bart Visscher
7e89a017bf Merge pull request #2955 from owncloud/displaynames-numeric 
Fix OC_User::getDisplaynames when using numeric user id's
 2013-04-26 05:51:07 -07:00
Bart Visscher
67b6ee661d Merge pull request #2783 from Kondou-ger/improve_passwordresetscreen 
Improve the password reset screen.
 2013-04-26 05:33:09 -07:00
Bart Visscher
b46f6e4f97 Simplify app js locating for layout pages 2013-04-26 14:21:51 +02:00
Bart Visscher
ea4ae857a1 Simplify app css locating for layout pages 2013-04-26 14:21:50 +02:00
Bart Visscher
710acde9a1 Merge pull request #1872 from herbrechtsmeier/forcessl-with-ssl-proxy 
Overwrite host and webroot when forcessl is enabled
 2013-04-26 05:10:49 -07:00
Bart Visscher
26e2672a5a Merge pull request #2787 from owncloud/fix-password-autocomplete-2632 
turn off autocompletion for password field
 2013-04-26 01:59:20 -07:00
Jenkins for ownCloud
d6978d0c45 [tx-robot] updated from transifex 2013-04-26 10:06:52 +02:00
Thomas Mueller
9fe3022c93 adding resource type 2013-04-26 09:59:00 +02:00
Jenkins for ownCloud
7ea2f785f4 [tx-robot] updated from transifex 2013-04-26 01:58:21 +02:00
Robin Appelman
809b5f81f6 Further seperation of mount management logic 2013-04-26 00:01:36 +02:00
Robin Appelman
bcd9a69033 Cache: seperate handing of numeric storage id's to it's own class 2013-04-26 00:00:18 +02:00
Morris Jobke
e6f84397aa Merge pull request #3098 from jerrac/displaynamesaveontimeout 
On the Personal Settings page, made the display name save like the email address saves
 2013-04-25 14:10:16 -07:00
icewind1991
80e91e1ac6 Merge pull request #3132 from owncloud/mount-setupfs 
Make sure the filesystem is initialized when searching for mounts
 2013-04-25 08:07:07 -07:00
Robin Appelman
cea56df59e Have the filecache updater testcase clean the filesystem properly 2013-04-25 16:56:48 +02:00
Robin Appelman
31d7f4df2a Make sure the filesystem is initialized when searching for mounts 2013-04-25 16:11:48 +02:00
Lukas Reschke
632221bed0 Correct the parameter description 
Thanks @kabum
 2013-04-25 14:27:08 +03:00
Lukas Reschke
2d4af5dfca Correct function description 
$password is not supported
 2013-04-25 14:20:32 +03:00
Thomas Tanghus
2397772847 Merge pull request #3126 from owncloud/json-utf8 
use utf-8 encoding for json
 2013-04-25 03:18:52 -07:00
Bernhard Posselt
c9c1e483c5 use utf-8 encoding for json 2013-04-25 11:36:41 +02:00
Bart Visscher
63b2699720 Merge pull request #3094 from owncloud/log-ajax 
fix logical issue while retrieving log via ajax
 2013-04-25 01:21:59 -07:00
Tom Needham
b3e7485612 Correct the api response when both a shipped app and/or a third party app fail 2013-04-25 01:08:11 +01:00
Jenkins for ownCloud
a0df5903b0 [tx-robot] updated from transifex 2013-04-25 01:55:56 +02:00
Thomas Tanghus
c84281990c Merge pull request #2993 from owncloud/resolve_apps_lib_path 
Let autoloader resolve paths under apps lib directory.
 2013-04-24 13:33:05 -07:00
Lukas Reschke
b6fee2d257 Remove uneeded link 2013-04-24 22:39:04 +03:00
raghunayyar
175fc0c737 Clubbing Exact styles together. 2013-04-24 23:47:39 +05:30
Lukas Reschke
1ee224d8cb Merge pull request #3108 from owncloud/fileactions-order 
Files: fix the order fileactions are computed for a file
 2013-04-24 10:55:38 -07:00