Lukas Reschke
|
ea70ca3ce3
|
CSRF checks
|
2012-07-07 16:12:21 +02:00 |
|
Lukas Reschke
|
2c318f45f4
|
CSRF checks
|
2012-07-07 16:08:27 +02:00 |
|
Lukas Reschke
|
04a0755fd3
|
CSRF checks
|
2012-07-07 16:03:21 +02:00 |
|
Lukas Reschke
|
b7c510a61a
|
CSRF checks
|
2012-07-07 16:02:33 +02:00 |
|
Lukas Reschke
|
0abcf0a421
|
CSRF checks
|
2012-07-07 15:58:11 +02:00 |
|
Lukas Reschke
|
c63db28eaf
|
CSRF check
|
2012-07-07 15:54:52 +02:00 |
Frank Karlitschek
|
b967530795
|
increase the time limit again to a sensible granularity of 1 min.
Please talk to me before changing this.
|
2012-07-06 18:42:41 +02:00 |
Bjoern Schiessle
|
ca26bcc581
|
close file after write process
|
2012-07-06 17:09:20 +02:00 |
|
Bjoern Schiessle
|
e91b4bc2ac
|
allow user to upload his own root certificate for secure webdav mount
|
2012-07-06 15:58:38 +02:00 |
Thomas Tanghus
|
75d01b065d
|
Make export batch size configurable.
|
2012-07-06 13:49:04 +02:00 |
|
Thomas Tanghus
|
cafbd02337
|
Fix endless loop when no addressbooks.
|
2012-07-06 13:24:56 +02:00 |
|
Thomas Tanghus
|
a1872412bf
|
Correct hack ;)
|
2012-07-06 12:59:07 +02:00 |
|
Thomas Tanghus
|
ab1b4f1f03
|
Fugly fixed include.
|
2012-07-06 12:59:07 +02:00 |
|
Bjoern Schiessle
|
963faf6458
|
CURLOPT_SSL_VERIFYPEER=false shouldn't be in master
|
2012-07-06 12:35:29 +02:00 |
|
Bjoern Schiessle
|
8353517969
|
use OC_Connector_Sabre_Client
|
2012-07-06 12:24:03 +02:00 |
Georg Ehrke
|
f875240b47
|
comment out some code
|
2012-07-06 11:23:20 +02:00 |
|
Georg Ehrke
|
9a10efd80f
|
Merge branch 'master' into calendar_import
|
2012-07-06 11:01:12 +02:00 |
|
Thomas Tanghus
|
a5a1d929ca
|
No need for being protected.
|
2012-07-06 03:22:42 +02:00 |
|
Thomas Tanghus
|
59b38e668d
|
Missing requesttoken
|
2012-07-06 03:22:42 +02:00 |
Bart Visscher
|
5e0b80dc8d
|
Contacts: Fix copy&paste error
|
2012-07-05 17:12:52 +02:00 |
|
Bjoern Schiessle
|
51774cca6b
|
use OC_Filesystem for rollback
|
2012-07-05 14:20:40 +02:00 |
|
Bjoern Schiessle
|
378fa2bc86
|
check if caview really exists
|
2012-07-05 12:17:33 +02:00 |
|
Bjoern Schiessle
|
55cde0e5aa
|
moved remove and rename hook to libs/hooks.php
|
2012-07-05 11:35:08 +02:00 |
|
Bjoern Schiessle
|
aa3b575ceb
|
disabled user upload of root certificates until sabredav client can handle them
|
2012-07-05 11:31:30 +02:00 |
|
Georg Ehrke
|
aa95cf2c98
|
Merge branch 'master' into calendar_import
|
2012-07-05 11:30:37 +02:00 |
|
Bjoern Schiessle
|
f86ecb3bf7
|
send ca cert path to sabredav client
|
2012-07-05 11:28:32 +02:00 |
|
Thomas Tanghus
|
9d00f4d2fb
|
Correct db default value.
|
2012-07-05 00:40:11 +02:00 |
|
Thomas Tanghus
|
dac2c14ae9
|
Add missing CSRF check.
|
2012-07-05 00:37:08 +02:00 |
|
Thomas Tanghus
|
5d79444852
|
Missing update script.
|
2012-07-04 22:58:31 +02:00 |
|
Thomas Tanghus
|
706a13544b
|
Remove ugly activation hack.
|
2012-07-04 22:13:36 +02:00 |
|
Georg Ehrke
|
7ec2d6ce85
|
Merge branch 'master' into calendar_import
|
2012-07-04 21:15:32 +02:00 |
|
Georg Ehrke
|
a4c2893128
|
some more work on calendar import - new import is (nearly) done
|
2012-07-04 21:14:40 +02:00 |
|
Bjoern Schiessle
|
e258da5c3c
|
certificate should be only visible for users
|
2012-07-04 17:22:04 +02:00 |
|
Bjoern Schiessle
|
5d61b85a1d
|
allow users to upload ssl root certificates for the webdav client
|
2012-07-04 17:18:36 +02:00 |
|
Thomas Tanghus
|
b2eac08ad3
|
Query contacts in batches of 20. Possible fix for oc-1126.
|
2012-07-04 16:54:00 +02:00 |
|
Thomas Tanghus
|
6d3afb3857
|
Moved action buttons down to the add field menu. Fixes oc-1155.
|
2012-07-04 13:57:07 +02:00 |
|
Georg Ehrke
|
657eef354a
|
Merge branch 'master' into calendar_import
|
2012-07-04 13:03:30 +02:00 |
|
Georg Ehrke
|
393eefa5d2
|
replace some direct links with OC.imagePath
|
2012-07-03 23:44:47 +02:00 |
|
Georg Ehrke
|
f98bd1ad66
|
Merge branch 'master' into calendar_import
|
2012-07-03 22:35:46 +02:00 |
|
Georg Ehrke
|
c036700c54
|
some more work on calendar import
|
2012-07-03 22:33:24 +02:00 |
Sam Tuke
|
b1c9785eb3
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
Conflicts:
apps/files_versions/lib/versions.php
|
2012-07-03 18:17:32 +01:00 |
|
Sam Tuke
|
a775deaf22
|
Moved hooks and versions.php into new lib directory
Part-ported filesystem operations to OC_FilesystemView
Refactored Storage class to depend on an OC_FsV object and have fewer static classes
|
2012-07-03 17:42:51 +01:00 |
|
Bjoern Schiessle
|
aec6eea235
|
use filesystem abstraction layer to copy file versions
|
2012-07-03 18:25:49 +02:00 |
|
Georg Ehrke
|
b6cff93254
|
fix spelling fail in code
|
2012-07-03 16:47:46 +02:00 |
|
Georg Ehrke
|
0b3ed2b048
|
Merge branch 'master' into calendar_import
|
2012-07-03 16:39:09 +02:00 |
|
Georg Ehrke
|
ca2b1f7863
|
fix encoding fail in calendar app - bugfix for oc-1194
|
2012-07-03 13:55:48 +02:00 |
|
Georg Ehrke
|
cfcfdd674e
|
Merge branch 'master' into calendar_import
|
2012-07-03 13:43:52 +02:00 |
|
Georg Ehrke
|
29a9559fa9
|
some work on calendar import dialog
|
2012-07-03 13:43:18 +02:00 |
Tom Needham
|
88cbbc86b8
|
Text editor: Always use UTF-8 to keep Ace happy.
|
2012-07-02 19:06:40 +00:00 |
Arthur Schiwon
|
0a6f7b33c3
|
LDAP: make it UTF-8 save
|
2012-07-02 20:31:19 +02:00 |
|
Bjoern Schiessle
|
ab036d4764
|
webdav client crashes for secure connections if he doesn't have the right root certificate for ssl verification. For the moment I print at least a useful error message to the OC log and the Apache log
|
2012-07-02 17:52:51 +02:00 |
|
Arthur Schiwon
|
515adceace
|
LDAP: reset resource on failed bind
check for resource
|
2012-07-02 14:03:29 +02:00 |
|
Georg Ehrke
|
e89a0949c4
|
remove some whitespace
|
2012-07-01 23:32:21 +02:00 |
|
Georg Ehrke
|
803f2c2517
|
some work on calendar import
|
2012-07-01 21:36:09 +02:00 |
Michael Gapczynski
|
eca2e073f8
|
Don't reload the page after sending private link to email address
|
2012-07-01 11:54:32 -04:00 |
|
Georg Ehrke
|
6a060ecd23
|
use light grey instead of white
|
2012-07-01 01:02:54 +02:00 |
|
Tom Needham
|
c7a4075aaa
|
Updates contacts migration provider
|
2012-06-30 22:56:47 +00:00 |
|
Georg Ehrke
|
be11f71d27
|
fix doc for OC_Calendar_Calendar::generateTextColor()
|
2012-07-01 00:31:05 +02:00 |
|
Georg Ehrke
|
601237a0c3
|
add algorithm to generate the calendar's text color
|
2012-07-01 00:09:33 +02:00 |
|
Georg Ehrke
|
ce331bd1d3
|
improvements for dropoimport
|
2012-06-30 23:18:41 +02:00 |
|
Georg Ehrke
|
a705b19cd5
|
little fix for import
|
2012-06-30 22:45:12 +02:00 |
|
Georg Ehrke
|
f15941a967
|
improve dropimport
|
2012-06-30 22:26:29 +02:00 |
|
Georg Ehrke
|
4890bbb30d
|
Merge branch 'master' into calendar_import
|
2012-06-30 22:08:36 +02:00 |
|
Georg Ehrke
|
376431fa0d
|
import works now for dropimport
|
2012-06-30 22:08:30 +02:00 |
|
Georg Ehrke
|
fa5b31ac9c
|
fix documentation style
|
2012-06-30 17:09:20 +02:00 |
|
Georg Ehrke
|
8e0addebc3
|
fix some doc
|
2012-06-30 15:39:20 +02:00 |
|
Georg Ehrke
|
34b2486d53
|
some improvements for calendar export
|
2012-06-30 15:23:21 +02:00 |
|
Georg Ehrke
|
390f5cc89f
|
some work on (drop)import)
|
2012-06-30 15:17:29 +02:00 |
|
Tom Needham
|
51173163ce
|
Contacts: align the bottom control buttons
|
2012-06-30 11:22:09 +00:00 |
|
Tom Needham
|
704a1c655e
|
Contacts: fix add contact icon path
|
2012-06-30 11:07:54 +00:00 |
|
Georg Ehrke
|
433d15d309
|
Merge branch 'master' into calendar_import
|
2012-06-30 12:50:26 +02:00 |
|
Georg Ehrke
|
6e6f90a8a2
|
fix merge conflicts
|
2012-06-30 12:44:51 +02:00 |
|
Georg Ehrke
|
34d4eb8edd
|
some more work on calendar import class
|
2012-06-30 12:42:36 +02:00 |
|
Michael Gapczynski
|
edc6a648d1
|
Fix placeholder value for optional fields in external storage UI
|
2012-06-29 19:35:57 -04:00 |
Robin Appelman
|
252453cd34
|
fix encryption test cases when not logged in
|
2012-06-30 01:05:18 +02:00 |
|
Thomas Tanghus
|
a4614f83ff
|
Don't add duplicate contacts in the list when en-/disable an address book.
|
2012-06-29 23:18:47 +02:00 |
|
Georg Ehrke
|
246894243a
|
Merge branch 'master' into calendar_import
|
2012-06-29 21:46:09 +02:00 |
|
Michael Gapczynski
|
719c7f7f6e
|
Fix WebDAV external storage opendir() and stat() for directories, bug fix for oc-1160
|
2012-06-29 13:01:00 -04:00 |
|
Bart Visscher
|
3ed7738d5e
|
Increment user_openid version to load new app type
|
2012-06-29 18:38:04 +02:00 |
|
Bart Visscher
|
f61793aa14
|
Coding style fixes
|
2012-06-29 18:38:04 +02:00 |
|
Bart Visscher
|
2b4ecbaba0
|
Whitespace fixes
|
2012-06-29 18:38:04 +02:00 |
|
Georg Ehrke
|
652a874fa6
|
fix displaying of events
|
2012-06-29 18:13:52 +02:00 |
|
Georg Ehrke
|
3bcf176a53
|
add some hooks to fix calendar sharing
|
2012-06-29 17:27:29 +02:00 |
|
Michael Gapczynski
|
7e9455c382
|
Allow multiple Google Drive and Dropbox external storages to be configured
|
2012-06-29 11:22:54 -04:00 |
|
Michael Gapczynski
|
2d49a491fb
|
Clear the mount point value for the new mount point row
|
2012-06-29 11:10:51 -04:00 |
|
Michael Gapczynski
|
f311c2a2ff
|
Hide the delete button on new mount point row
|
2012-06-29 11:10:51 -04:00 |
|
Georg Ehrke
|
bda0026374
|
fix birthday calendar
|
2012-06-29 15:43:18 +02:00 |
|
Bjoern Schiessle
|
b95996c02c
|
- when creating a new text file or directory which name already exist use the same pattern as for file uploads in such a case (add a (N) to the name)
- don't allow renaming if a file/directory with the name already exists
|
2012-06-29 15:23:04 +02:00 |
|
Georg Ehrke
|
08e707d258
|
some work on OC_Calendar_Import
|
2012-06-29 14:32:07 +02:00 |
|
Bjoern Schiessle
|
60ec46f706
|
- remove leading http[s] to let createBaseUri() generate secure/unsecure base URI
- if secure is set to true add 's' to http
|
2012-06-29 12:01:23 +02:00 |
|
Robin Appelman
|
75af5778a4
|
pass progresskey the correct way during calender import
|
2012-06-29 00:49:37 +02:00 |
|
Michael Gapczynski
|
31bba86e87
|
Fix external storage UI for Admin page
|
2012-06-28 17:55:22 -04:00 |
|
Bart Visscher
|
02e4e0e08f
|
Gallery: Get all the image information for a directory at once
|
2012-06-28 22:11:04 +02:00 |
|
Georg Ehrke
|
91d92aed02
|
fix for previous commit
|
2012-06-28 19:13:43 +02:00 |
|
Georg Ehrke
|
4b3af1f73b
|
use OC_Calendar_Export for publicly shared calendars
|
2012-06-28 19:12:50 +02:00 |
|
Georg Ehrke
|
930bbeabd4
|
Calendar Export: replace spaces with dashes in the name of the calendar / event
|
2012-06-28 19:04:14 +02:00 |
|
Georg Ehrke
|
9dd7ca2667
|
some changes and more doc for OC_Calendar_Export class
|
2012-06-28 18:54:13 +02:00 |
|
Georg Ehrke
|
9a4709e68d
|
fix calendar export for Apple iCal - i hate bloody line ends
|
2012-06-28 16:41:00 +02:00 |
|
Georg Ehrke
|
c4f5639cb4
|
Merge branch 'master' into calendar_export
|
2012-06-28 15:24:30 +02:00 |
|
Bjoern Schiessle
|
bdd1baeb85
|
use public API
|
2012-06-28 14:18:57 +02:00 |
|
Bjoern Schiessle
|
e5792cc064
|
adjust the name and/or location of the stored versions if the actual file gets moved or renamed
|
2012-06-28 14:06:20 +02:00 |
|
Bjoern Schiessle
|
f22f49671b
|
move hook to erase versions from deleted files to the right place
|
2012-06-28 12:42:47 +02:00 |
|
Bjoern Schiessle
|
52f99a7570
|
delete file versions if the user deletes a file
|
2012-06-28 11:48:57 +02:00 |
|
Bjoern Schiessle
|
dac539b619
|
handover the correct timestamp
|
2012-06-28 11:46:17 +02:00 |
|
Georg Ehrke
|
3cea1b062e
|
Merge branch 'master' into calendar_export
|
2012-06-28 09:27:54 +02:00 |
|
Thomas Tanghus
|
e04a605b9b
|
No need for this anymore.
|
2012-06-28 01:51:42 +02:00 |
|
Thomas Tanghus
|
a48aba316e
|
Smoother profile picture loading - hopefully.
|
2012-06-28 01:46:33 +02:00 |
|
Michael Gapczynski
|
db6139fd41
|
Don't overwrite fake directory stream for Amazon S3 storage
|
2012-06-27 19:44:52 -04:00 |
|
Tom Needham
|
426193cf6c
|
Migration: Fix contacts and bookmarks
|
2012-06-27 21:18:31 +00:00 |
|
Thomas Tanghus
|
77b7f214d2
|
Load contactlist progressivly.
|
2012-06-27 22:44:28 +02:00 |
|
Georg Ehrke
|
e029e8cb14
|
Merge branch 'master' into calendar_export
|
2012-06-27 22:27:55 +02:00 |
|
Georg Ehrke
|
8712754f8c
|
fix style of some doc
|
2012-06-27 22:27:48 +02:00 |
|
Georg Ehrke
|
1f738d8c9f
|
Merge branch 'master' into calendar_export
|
2012-06-27 22:24:12 +02:00 |
|
Michael Gapczynski
|
9b605969f1
|
Fixes in Dropbox API, try to catch Dropbox exceptions, implement rename and copy in Dropbox storage backend
|
2012-06-27 15:23:49 -04:00 |
|
Georg Ehrke
|
77c66e8cc4
|
move some documentation to the right place
|
2012-06-27 21:05:46 +02:00 |
|
Georg Ehrke
|
25a50f00bd
|
add merge calendar function and add some documentation to OC_Calendar_Calendar
|
2012-06-27 20:56:58 +02:00 |
|
Michael Gapczynski
|
b7f86cf282
|
Add Samba Share parameter to external storage UI
|
2012-06-27 12:24:21 -04:00 |
|
Michael Gapczynski
|
2c773d549d
|
Don't overwrite fake directory stream for Shared storage
|
2012-06-27 12:07:42 -04:00 |
|
Michael Gapczynski
|
19f94774fb
|
Don't overwrite fake directory stream for Dropbox and Google Drive
|
2012-06-27 12:04:33 -04:00 |
|
Bjoern Schiessle
|
c67ae2e7f1
|
no reason to strip tags at this point
|
2012-06-27 15:56:14 +02:00 |
|
Bjoern Schiessle
|
d5237c42bc
|
Util::formatDate() expect $timestamp as double
|
2012-06-27 15:05:40 +02:00 |
|
Georg Ehrke
|
90b5cf680f
|
Merge branch 'master' into calendar_export
|
2012-06-27 14:05:11 +02:00 |
|
Bjoern Schiessle
|
060a297260
|
enable highlighting of address in OSM.
|
2012-06-27 11:46:42 +02:00 |
|
Michael Gapczynski
|
79da782892
|
Improve error handling of Dropbox storage backend
|
2012-06-26 20:37:50 -04:00 |
|
Thomas Tanghus
|
3edc40a68a
|
Load default categories if there are none,
|
2012-06-27 02:12:53 +02:00 |
|
Thomas Tanghus
|
823bef3a09
|
Ensure event handlers are being set when adding first contact.
|
2012-06-27 02:12:53 +02:00 |
|
Thomas Tanghus
|
afd9705283
|
Add check for return value.
|
2012-06-27 02:12:53 +02:00 |
|
Michael Gapczynski
|
f55f13eebc
|
Don't call getLocalFile() until you know it actually is music
|
2012-06-26 14:51:31 -04:00 |
|
Thomas Tanghus
|
cad282b73f
|
Added some error checking.
|
2012-06-26 18:15:24 +02:00 |
|
Thomas Tanghus
|
1b2d09f9ca
|
Added missing requesttoken.
|
2012-06-26 18:15:24 +02:00 |
|
Thomas Tanghus
|
d8b181cd84
|
Added error checking on all db queries.
|
2012-06-26 18:15:24 +02:00 |
|
Thomas Tanghus
|
db115429f7
|
Added createUser hook.
|
2012-06-26 18:15:24 +02:00 |
|
Bjoern Schiessle
|
de4a540ce6
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-06-26 16:30:34 +02:00 |
|
Thomas Tanghus
|
46e93168cd
|
Fix variable name.
|
2012-06-26 16:06:52 +02:00 |
|
Bjoern Schiessle
|
7dc72a48cc
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-06-26 15:48:21 +02:00 |
|
Georg Ehrke
|
b9ce4e1f40
|
add OC_Calendar_Object::createUID()
|
2012-06-26 15:20:29 +02:00 |
|
Bjoern Schiessle
|
9cb01bd093
|
xss fix
|
2012-06-26 14:27:50 +02:00 |
|
Georg Ehrke
|
c7de74c471
|
Merge branch 'master' into calendar_export
|
2012-06-26 14:15:07 +02:00 |
|
Thomas Tanghus
|
bf756293c6
|
Added signals.
|
2012-06-26 05:26:50 +02:00 |
|
Thomas Tanghus
|
8df59852a4
|
Adjust pic width a bit.
|
2012-06-26 04:09:45 +02:00 |
|
Thomas Tanghus
|
b384d79bf8
|
Remove x-scrollbar from contacts list.
|
2012-06-25 23:32:03 +02:00 |
|
Bart Visscher
|
103ae6faa4
|
Media: Change includes in app.php to use the autoloader
|
2012-06-25 21:05:10 +02:00 |
|
Arthur Schiwon
|
fb53708d10
|
LDAP: compare base trees case insensitively
|
2012-06-25 20:53:45 +02:00 |
|
Thomas Tanghus
|
2250fb1159
|
Emit Completed.
|
2012-06-25 20:30:21 +02:00 |
|
Thomas Tanghus
|
dc4b891327
|
Better visual feedback and prevent drop on self.
|
2012-06-25 18:24:15 +02:00 |
|
Thomas Tanghus
|
b8d6ad0431
|
Improve styling on draggables.
|
2012-06-25 18:24:15 +02:00 |
|
Sam Tuke
|
380f41136c
|
Added placeholder msg to share with menu to clarify user list restricted to security context
|
2012-06-25 16:57:41 +01:00 |
|
Arthur Schiwon
|
9bb409d881
|
fix syntax error after merge
|
2012-06-25 17:34:28 +02:00 |
|
Thomas Tanghus
|
ef93bf223a
|
Try to conserve some memory. Should fix oc-1106 for master.
|
2012-06-25 17:26:44 +02:00 |
|
Arthur Schiwon
|
3f6a7859c9
|
LDAP: cheaper userExists() implementation, fixes oc-1012
|
2012-06-25 13:22:00 +02:00 |
|
Arthur Schiwon
|
d64a7716f1
|
LDAP: always sanitize DN and DN-containing attributes
|
2012-06-25 13:22:00 +02:00 |
|
Bjoern Schiessle
|
a09a01a49f
|
sanitizeHTML() has to be called later to keep the path unchanged
|
2012-06-25 12:44:54 +02:00 |
|
Bjoern Schiessle
|
9ee528bc74
|
Only delete existing thumbnails (bug #1100)
|
2012-06-25 10:15:20 +02:00 |
|
Thomas Tanghus
|
052bd8efbb
|
Drag'n'Drop contacts between addressbook. Still needs some css magic.
|
2012-06-25 03:42:27 +02:00 |
Brice Maron
|
51d33768b8
|
Prevent errors and mini enhancement of saved window in bookmarks
|
2012-06-24 21:30:14 +00:00 |
|
Brice Maron
|
0fb9d0bf29
|
Correct bookmark app : add through interface and remove missing css
|
2012-06-24 21:24:43 +00:00 |
|
Thomas Tanghus
|
e845e56749
|
Remove excessive debugging.
|
2012-06-24 22:25:32 +02:00 |
|
Thomas Tanghus
|
3afbc3d2dc
|
Add some DRYness to logging.
|
2012-06-24 22:25:32 +02:00 |
|
Thomas Tanghus
|
f10c51193b
|
Fixed function name.
|
2012-06-24 22:25:32 +02:00 |
|
Thomas Tanghus
|
df1eca4fa2
|
Also load categories from VJOURNAL.
|
2012-06-24 22:25:32 +02:00 |
|
Brice Maron
|
61adae1e49
|
Use intervals for sessions deletion with postgres fix oc-492
|
2012-06-24 19:41:23 +00:00 |
|
Brice Maron
|
f56b3df0bc
|
Resolve scanning issue case comparison of songs
|
2012-06-24 16:03:25 +00:00 |
|
Brice Maron
|
c53a8fa541
|
Correct seq name in media songs fix oc-589
|
2012-06-24 16:02:41 +00:00 |
|
Thomas Tanghus
|
0f9b9fa111
|
Remove unneeded parameter.
|
2012-06-24 16:07:18 +02:00 |
|
Thomas Tanghus
|
5393c0cfed
|
Click to select which address book to add to.
|
2012-06-24 16:03:10 +02:00 |
|
Thomas Tanghus
|
9e6d2f2f82
|
Improve prev/next selection on delete.
|
2012-06-24 15:07:44 +02:00 |
|
Georg Ehrke
|
ca5de26bac
|
another fix for oc-1044
|
2012-06-24 09:41:37 +02:00 |
|
Georg Ehrke
|
17e289aef2
|
Merge branch 'master' into calendar_export
|
2012-06-23 19:54:12 +02:00 |
|
Tom Needham
|
6e5573acb5
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-06-23 14:42:54 +00:00 |
|
Tom Needham
|
5323983fc7
|
Text editor: Waste less space for line numbers
|
2012-06-23 14:42:37 +00:00 |
|
Brice Maron
|
d39d7fb9ff
|
Remove references to /apps/ and correct inclusion of settings
|
2012-06-22 22:05:39 +00:00 |
|
Brice Maron
|
b5e3e150eb
|
Correction of path looking for apps and css
|
2012-06-22 20:58:52 +00:00 |
|
Bart Visscher
|
ded9ea5ad3
|
Spelling fixes
|
2012-06-22 22:57:35 +02:00 |
|
Bart Visscher
|
ea3a6d9fcf
|
Merge resource error-suppressing fix
|
2012-06-22 22:54:25 +02:00 |
|
Bart Visscher
|
2e6e154475
|
Gallery: Fix opening folders with a ' in the name
|
2012-06-22 22:46:12 +02:00 |
|
Georg Ehrke
|
0939b1b0ab
|
Merge branch 'master' into calendar_export
|
2012-06-22 21:36:51 +02:00 |
Michael Gapczynski
|
618a3c1d94
|
Fix removing personal mounts
|
2012-06-22 12:22:42 -04:00 |
|
Michael Gapczynski
|
b650f46698
|
Fix variable checks for mounting Google Drive
|
2012-06-22 12:22:42 -04:00 |
|
Tom Needham
|
41cfd55f55
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-06-22 16:17:23 +00:00 |
|
Bart Visscher
|
96ec7a66bb
|
More session_write_close
|
2012-06-22 17:21:56 +02:00 |
|
Tom Needham
|
0aafc717ec
|
Text Editor: fix editor positioning
|
2012-06-22 15:02:03 +00:00 |
Thomas Mueller
|
aade44471d
|
pdf viewer no longer 'eats' keyboard input
|
2012-06-22 16:10:25 +02:00 |
|
Thomas Tanghus
|
1f06cdf81f
|
Small js fix.
|
2012-06-22 14:27:46 +02:00 |
|
Thomas Tanghus
|
07124ee38d
|
Cast translation to string.
|
2012-06-22 14:27:46 +02:00 |
|
Bjoern Schiessle
|
e1fa9c282b
|
xss vulnerabilities fixed
|
2012-06-22 14:11:57 +02:00 |
|
Bjoern Schiessle
|
5b46734a40
|
xss vulnerability fixed
|
2012-06-22 13:58:15 +02:00 |
|
Brice Maron
|
8c2803a7c1
|
Correct image path and apps path replacement
|
2012-06-22 13:12:03 +02:00 |
|
Arthur Schiwon
|
19931e2008
|
remove unnecessary closing PHP tag
|
2012-06-22 12:49:56 +02:00 |
|
Arthur Schiwon
|
bef9b671ee
|
LDAP: cheaper userExists() implementation
|
2012-06-22 12:42:07 +02:00 |
|
Bjoern Schiessle
|
8c28aec664
|
date don't change correctly in the view list (bug #973) fixed
|
2012-06-22 11:30:40 +02:00 |
|
Bart Visscher
|
82f39d3292
|
Contacts: Fix name and carddav-url encoding
|
2012-06-21 23:30:04 +02:00 |
|
Bart Visscher
|
fd23c286ef
|
Calendar: Fix caldav url encoding
|
2012-06-21 23:30:04 +02:00 |
|
Bart Visscher
|
4a22f4ca78
|
Calendar: convert choosecalendar.rowfields template from plain php to html+php
|
2012-06-21 23:30:04 +02:00 |
|
Bart Visscher
|
1d07b9e291
|
Calendar: Missing userid in allCalendars call
|
2012-06-21 23:30:04 +02:00 |
|
Bart Visscher
|
c047fdafdb
|
Calendar: Fix missing template parameter 'shared' for new and update calendar
|
2012-06-21 23:30:04 +02:00 |
|
Brice Maron
|
95b5202893
|
Correct usage of approot
|
2012-06-21 21:13:12 +00:00 |
|
Michael Gapczynski
|
bf6abdde2d
|
Add missing ')'
|
2012-06-21 12:26:06 -04:00 |
|
Brice Maron
|
a5938e4e37
|
Merge branch 'master' into multi_app_dir
|
2012-06-21 20:19:31 +00:00 |
|
Thomas Tanghus
|
37d12144c2
|
Fix URL delimiter.
|
2012-06-21 22:03:57 +02:00 |
|
Thomas Tanghus
|
ad7154b344
|
Fix being able to link directly to contact, that I broke in other commit.
|
2012-06-21 22:02:17 +02:00 |